diff --git a/packages/gui/build/icons/0x0.png b/packages/gui/build/icons/0x0.png new file mode 100644 index 00000000..d838fc66 Binary files /dev/null and b/packages/gui/build/icons/0x0.png differ diff --git a/packages/gui/build/icons/1024x1024.png b/packages/gui/build/icons/1024x1024.png index 92ff79f4..ed2f935c 100644 Binary files a/packages/gui/build/icons/1024x1024.png and b/packages/gui/build/icons/1024x1024.png differ diff --git a/packages/gui/build/icons/128x128.png b/packages/gui/build/icons/128x128.png index 0f2ca4d5..3b6d1222 100644 Binary files a/packages/gui/build/icons/128x128.png and b/packages/gui/build/icons/128x128.png differ diff --git a/packages/gui/build/icons/16x16.png b/packages/gui/build/icons/16x16.png index 79dd2265..ba875de0 100644 Binary files a/packages/gui/build/icons/16x16.png and b/packages/gui/build/icons/16x16.png differ diff --git a/packages/gui/build/icons/24x24.png b/packages/gui/build/icons/24x24.png index 256a7f51..7cfd2a07 100644 Binary files a/packages/gui/build/icons/24x24.png and b/packages/gui/build/icons/24x24.png differ diff --git a/packages/gui/build/icons/256x256.png b/packages/gui/build/icons/256x256.png index 16025d6e..aef49c44 100644 Binary files a/packages/gui/build/icons/256x256.png and b/packages/gui/build/icons/256x256.png differ diff --git a/packages/gui/build/icons/32x32.png b/packages/gui/build/icons/32x32.png index dac1fd5d..18286299 100644 Binary files a/packages/gui/build/icons/32x32.png and b/packages/gui/build/icons/32x32.png differ diff --git a/packages/gui/build/icons/48x48.png b/packages/gui/build/icons/48x48.png index 52eda64f..c8e84097 100644 Binary files a/packages/gui/build/icons/48x48.png and b/packages/gui/build/icons/48x48.png differ diff --git a/packages/gui/build/icons/512x512.png b/packages/gui/build/icons/512x512.png index b0672c2a..d838fc66 100644 Binary files a/packages/gui/build/icons/512x512.png and b/packages/gui/build/icons/512x512.png differ diff --git a/packages/gui/build/icons/64x64.png b/packages/gui/build/icons/64x64.png index b1093380..742abc69 100644 Binary files a/packages/gui/build/icons/64x64.png and b/packages/gui/build/icons/64x64.png differ diff --git a/packages/gui/build/icons/icon.icns b/packages/gui/build/icons/icon.icns index 39bee01a..f076e039 100644 Binary files a/packages/gui/build/icons/icon.icns and b/packages/gui/build/icons/icon.icns differ diff --git a/packages/gui/build/icons/icon.ico b/packages/gui/build/icons/icon.ico index 21b26b2c..a8b71392 100644 Binary files a/packages/gui/build/icons/icon.ico and b/packages/gui/build/icons/icon.ico differ diff --git a/packages/gui/build/mac/0x0.png b/packages/gui/build/mac/0x0.png new file mode 100644 index 00000000..0702bbd3 Binary files /dev/null and b/packages/gui/build/mac/0x0.png differ diff --git a/packages/gui/package.json b/packages/gui/package.json index 08fa1909..3ace4bd0 100644 --- a/packages/gui/package.json +++ b/packages/gui/package.json @@ -45,7 +45,7 @@ }, "devDependencies": { "@vue/eslint-config-standard": "^5.1.2", - "electron-icon-builder": "^1.0.2", + "electron-icon-builder": "^2.0.1", "eslint-plugin-import": "^2.20.2", "eslint-plugin-node": "^11.1.0", "eslint-plugin-promise": "^4.2.1", diff --git a/packages/gui/pkg/after-pack.js b/packages/gui/pkg/after-pack.js index b3205582..c5b43a57 100644 --- a/packages/gui/pkg/after-pack.js +++ b/packages/gui/pkg/after-pack.js @@ -8,6 +8,9 @@ exports.default = async function (context) { if (context.packager.platform.nodeName === 'darwin') { targetPath = path.join(context.appOutDir, `${context.packager.appInfo.productName}.app/Contents/Resources`) systemType = 'mac' + } else if (context.packager.platform.nodeName === 'linux') { + targetPath = path.join(context.appOutDir, './resources') + systemType = 'linux' } else { targetPath = path.join(context.appOutDir, './resources') systemType = 'win' diff --git a/packages/gui/src/bridge/update/backend.js b/packages/gui/src/bridge/update/backend.js index a212450c..669eda45 100644 --- a/packages/gui/src/bridge/update/backend.js +++ b/packages/gui/src/bridge/update/backend.js @@ -56,7 +56,7 @@ function updateHandle (app, api, win, beforeQuit, quit, log) { if (isMac) { autoUpdater.updateConfigPath = path.join(__dirname, 'mac/DevSidecar.app/Contents/Resources/app-update.yml') } else if (isLinux) { - autoUpdater.updateConfigPath = path.join(__dirname, 'mac/DevSidecar.app/Contents/Resources/app-update.yml') + // autoUpdater.updateConfigPath = path.join(__dirname, 'mac/DevSidecar.app/Contents/Resources/app-update.yml') } else { autoUpdater.updateConfigPath = path.join(__dirname, 'win-unpacked/resources/app-update.yml') } diff --git a/packages/gui/vue.config.js b/packages/gui/vue.config.js index 174a9bf0..17b35da2 100644 --- a/packages/gui/vue.config.js +++ b/packages/gui/vue.config.js @@ -63,11 +63,11 @@ module.exports = { win: { requestedExecutionLevel: 'requireAdministrator' }, - icon: './build/icons/512x512.png', linux: { - icon: './build/mac/', + icon: 'build/mac/', target: [ - 'deb' + // 'deb' + 'AppImage' ] }, publish: { diff --git a/packages/gui/yarn.lock b/packages/gui/yarn.lock index be10bff0..86981c71 100644 --- a/packages/gui/yarn.lock +++ b/packages/gui/yarn.lock @@ -1021,26 +1021,24 @@ cssnano-preset-default "^4.0.0" postcss "^7.0.0" -"@jimp/bmp@^0.9.8": - version "0.9.8" - resolved "https://registry.npmjs.org/@jimp/bmp/-/bmp-0.9.8.tgz" - integrity sha512-CZYQPEC3iUBMuaGWrtIG+GKNl93q/PkdudrCKJR/B96dfNngsmoosEm3LuFgJHEcJIfvnJkNqKw74l+zEiqCbg== +"@jimp/bmp@^0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@jimp/bmp/-/bmp-0.16.1.tgz#6e2da655b2ba22e721df0795423f34e92ef13768" + integrity sha512-iwyNYQeBawrdg/f24x3pQ5rEx+/GwjZcCXd3Kgc+ZUd+Ivia7sIqBsOnDaMZdKCBPlfW364ekexnlOqyVa0NWg== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.8" + "@jimp/utils" "^0.16.1" bmp-js "^0.1.0" - core-js "^3.4.1" -"@jimp/core@^0.9.8": - version "0.9.8" - resolved "https://registry.npmjs.org/@jimp/core/-/core-0.9.8.tgz" - integrity sha512-N4GCjcXb0QwR5GBABDK2xQ3cKyaF7LlCYeJEG9mV7G/ynBoRqJe4JA6YKU9Ww9imGkci/4A594nQo8tUIqdcBw== +"@jimp/core@^0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@jimp/core/-/core-0.16.1.tgz#68c4288f6ef7f31a0f6b859ba3fb28dae930d39d" + integrity sha512-la7kQia31V6kQ4q1kI/uLimu8FXx7imWVajDGtwUG8fzePLWDFJyZl0fdIXVCL1JW2nBcRHidUot6jvlRDi2+g== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.8" + "@jimp/utils" "^0.16.1" any-base "^1.1.0" buffer "^5.2.0" - core-js "^3.4.1" exif-parser "^0.1.12" file-type "^9.0.0" load-bmfont "^1.3.1" @@ -1049,296 +1047,269 @@ pixelmatch "^4.0.2" tinycolor2 "^1.4.1" -"@jimp/custom@^0.9.8": - version "0.9.8" - resolved "https://registry.npmjs.org/@jimp/custom/-/custom-0.9.8.tgz" - integrity sha512-1UpJjI7fhX02BWLJ/KEqPwkHH60eNkCNeD6hEd+IZdTwLXfZCfFiM5BVlpgiZYZJSsVoRiAL4ne2Q5mCiKPKyw== +"@jimp/custom@^0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@jimp/custom/-/custom-0.16.1.tgz#28b659c59e20a1d75a0c46067bd3f4bd302cf9c5" + integrity sha512-DNUAHNSiUI/j9hmbatD6WN/EBIyeq4AO0frl5ETtt51VN1SvE4t4v83ZA/V6ikxEf3hxLju4tQ5Pc3zmZkN/3A== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/core" "^0.9.8" - core-js "^3.4.1" + "@jimp/core" "^0.16.1" -"@jimp/gif@^0.9.8": - version "0.9.8" - resolved "https://registry.npmjs.org/@jimp/gif/-/gif-0.9.8.tgz" - integrity sha512-LEbfpcO1sBJIQCJHchZjNlyNxzPjZQQ4X32klpQHZJG58n9FvL7Uuh1rpkrJRbqv3cU3P0ENNtTrsBDxsYwcfA== +"@jimp/gif@^0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@jimp/gif/-/gif-0.16.1.tgz#d1f7c3a58f4666482750933af8b8f4666414f3ca" + integrity sha512-r/1+GzIW1D5zrP4tNrfW+3y4vqD935WBXSc8X/wm23QTY9aJO9Lw6PEdzpYCEY+SOklIFKaJYUAq/Nvgm/9ryw== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.8" - core-js "^3.4.1" + "@jimp/utils" "^0.16.1" + gifwrap "^0.9.2" omggif "^1.0.9" -"@jimp/jpeg@^0.9.8": - version "0.9.8" - resolved "https://registry.npmjs.org/@jimp/jpeg/-/jpeg-0.9.8.tgz" - integrity sha512-5u29SUzbZ32ZMmOaz3gO0hXatwSCnsvEAXRCKZoPPgbsPoyFAiZKVxjfLzjkeQF6awkvJ8hZni5chM15SNMg+g== +"@jimp/jpeg@^0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@jimp/jpeg/-/jpeg-0.16.1.tgz#3b7bb08a4173f2f6d81f3049b251df3ee2ac8175" + integrity sha512-8352zrdlCCLFdZ/J+JjBslDvml+fS3Z8gttdml0We759PnnZGqrnPRhkOEOJbNUlE+dD4ckLeIe6NPxlS/7U+w== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.8" - core-js "^3.4.1" - jpeg-js "^0.3.4" + "@jimp/utils" "^0.16.1" + jpeg-js "0.4.2" -"@jimp/plugin-blit@^0.9.8": - version "0.9.8" - resolved "https://registry.npmjs.org/@jimp/plugin-blit/-/plugin-blit-0.9.8.tgz" - integrity sha512-6xTDomxJybhBcby1IUVaPydZFhxf+V0DRgfDlVK81kR9kSCoshJpzWqDuWrMqjNEPspPE7jRQwHMs0FdU7mVwQ== +"@jimp/plugin-blit@^0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-blit/-/plugin-blit-0.16.1.tgz#09ea919f9d326de3b9c2826fe4155da37dde8edb" + integrity sha512-fKFNARm32RoLSokJ8WZXHHH2CGzz6ire2n1Jh6u+XQLhk9TweT1DcLHIXwQMh8oR12KgjbgsMGvrMVlVknmOAg== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.8" - core-js "^3.4.1" + "@jimp/utils" "^0.16.1" -"@jimp/plugin-blur@^0.9.8": - version "0.9.8" - resolved "https://registry.npmjs.org/@jimp/plugin-blur/-/plugin-blur-0.9.8.tgz" - integrity sha512-dqbxuNFBRbmt35iIRacdgma7nlXklmPThsKcGWNTDmqb/hniK5IC+0xSPzBV4qMI2fLGP39LWHqqDZ0xDz14dA== +"@jimp/plugin-blur@^0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-blur/-/plugin-blur-0.16.1.tgz#e614fa002797dcd662e705d4cea376e7db968bf5" + integrity sha512-1WhuLGGj9MypFKRcPvmW45ht7nXkOKu+lg3n2VBzIB7r4kKNVchuI59bXaCYQumOLEqVK7JdB4glaDAbCQCLyw== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.8" - core-js "^3.4.1" + "@jimp/utils" "^0.16.1" -"@jimp/plugin-circle@^0.9.8": - version "0.9.8" - resolved "https://registry.npmjs.org/@jimp/plugin-circle/-/plugin-circle-0.9.8.tgz" - integrity sha512-+UStXUPCzPqzTixLC8eVqcFcEa6TS+BEM/6/hyM11TDb9sbiMGeUtgpwZP/euR5H5gfpAQDA1Ppzqhh5fuMDlw== +"@jimp/plugin-circle@^0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-circle/-/plugin-circle-0.16.1.tgz#20e3194a67ca29740aba2630fd4d0a89afa27491" + integrity sha512-JK7yi1CIU7/XL8hdahjcbGA3V7c+F+Iw+mhMQhLEi7Q0tCnZ69YJBTamMiNg3fWPVfMuvWJJKOBRVpwNTuaZRg== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.8" - core-js "^3.4.1" + "@jimp/utils" "^0.16.1" -"@jimp/plugin-color@^0.9.8": - version "0.9.8" - resolved "https://registry.npmjs.org/@jimp/plugin-color/-/plugin-color-0.9.8.tgz" - integrity sha512-SDHxOQsJHpt75hk6+sSlCPc2B3UJlXosFW+iLZ11xX1Qr0IdDtbfYlIoPmjKQFIDUNzqLSue/z7sKQ1OMZr/QA== +"@jimp/plugin-color@^0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-color/-/plugin-color-0.16.1.tgz#0f298ba74dee818b663834cd80d53e56f3755233" + integrity sha512-9yQttBAO5SEFj7S6nJK54f+1BnuBG4c28q+iyzm1JjtnehjqMg6Ljw4gCSDCvoCQ3jBSYHN66pmwTV74SU1B7A== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.8" - core-js "^3.4.1" + "@jimp/utils" "^0.16.1" tinycolor2 "^1.4.1" -"@jimp/plugin-contain@^0.9.8": - version "0.9.8" - resolved "https://registry.npmjs.org/@jimp/plugin-contain/-/plugin-contain-0.9.8.tgz" - integrity sha512-oK52CPt7efozuLYCML7qOmpFeDt3zpU8qq8UZlnjsDs15reU6L8EiUbwYpJvzoEnEOh1ZqamB8F/gymViEO5og== +"@jimp/plugin-contain@^0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-contain/-/plugin-contain-0.16.1.tgz#3c5f5c495fd9bb08a970739d83694934f58123f2" + integrity sha512-44F3dUIjBDHN+Ym/vEfg+jtjMjAqd2uw9nssN67/n4FdpuZUVs7E7wadKY1RRNuJO+WgcD5aDQcsvurXMETQTg== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.8" - core-js "^3.4.1" + "@jimp/utils" "^0.16.1" -"@jimp/plugin-cover@^0.9.8": - version "0.9.8" - resolved "https://registry.npmjs.org/@jimp/plugin-cover/-/plugin-cover-0.9.8.tgz" - integrity sha512-nnamtHzMrNd5j5HRSPd1VzpZ8v9YYtUJPtvCdHOOiIjqG72jxJ2kTBlsS3oG5XS64h/2MJwpl/fmmMs1Tj1CmQ== +"@jimp/plugin-cover@^0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-cover/-/plugin-cover-0.16.1.tgz#0e8caec16a40abe15b1b32e5383a603a3306dc41" + integrity sha512-YztWCIldBAVo0zxcQXR+a/uk3/TtYnpKU2CanOPJ7baIuDlWPsG+YE4xTsswZZc12H9Kl7CiziEbDtvF9kwA/Q== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.8" - core-js "^3.4.1" + "@jimp/utils" "^0.16.1" -"@jimp/plugin-crop@^0.9.8": - version "0.9.8" - resolved "https://registry.npmjs.org/@jimp/plugin-crop/-/plugin-crop-0.9.8.tgz" - integrity sha512-Nv/6AIp4aJmbSIH2uiIqm+kSoShKM8eaX2fyrUTj811kio0hwD3f/vIxrWebvAqwDZjAFIAmMufFoFCVg6caoQ== +"@jimp/plugin-crop@^0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-crop/-/plugin-crop-0.16.1.tgz#b362497c873043fe47ba881ab08604bf7226f50f" + integrity sha512-UQdva9oQzCVadkyo3T5Tv2CUZbf0klm2cD4cWMlASuTOYgaGaFHhT9st+kmfvXjKL8q3STkBu/zUPV6PbuV3ew== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.8" - core-js "^3.4.1" + "@jimp/utils" "^0.16.1" -"@jimp/plugin-displace@^0.9.8": - version "0.9.8" - resolved "https://registry.npmjs.org/@jimp/plugin-displace/-/plugin-displace-0.9.8.tgz" - integrity sha512-0OgPjkOVa2xdbqI8P6gBKX/UK36RbaYVrFyXL8Jy9oNF69+LYWyTskuCu9YbGxzlCVjY/JFqQOvrKDbxgMYAKA== +"@jimp/plugin-displace@^0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-displace/-/plugin-displace-0.16.1.tgz#4dd9db518c3e78de9d723f86a234bf98922afe8d" + integrity sha512-iVAWuz2+G6Heu8gVZksUz+4hQYpR4R0R/RtBzpWEl8ItBe7O6QjORAkhxzg+WdYLL2A/Yd4ekTpvK0/qW8hTVw== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.8" - core-js "^3.4.1" + "@jimp/utils" "^0.16.1" -"@jimp/plugin-dither@^0.9.8": - version "0.9.8" - resolved "https://registry.npmjs.org/@jimp/plugin-dither/-/plugin-dither-0.9.8.tgz" - integrity sha512-jGM/4ByniZJnmV2fv8hKwyyydXZe/YzvgBcnB8XxzCq8kVR3Imcn+qnd2PEPZzIPKOTH4Cig/zo9Vk9Bs+m5FQ== +"@jimp/plugin-dither@^0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-dither/-/plugin-dither-0.16.1.tgz#b47de2c0bb09608bed228b41c3cd01a85ec2d45b" + integrity sha512-tADKVd+HDC9EhJRUDwMvzBXPz4GLoU6s5P7xkVq46tskExYSptgj5713J5Thj3NMgH9Rsqu22jNg1H/7tr3V9Q== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.8" - core-js "^3.4.1" + "@jimp/utils" "^0.16.1" -"@jimp/plugin-fisheye@^0.9.8": - version "0.9.8" - resolved "https://registry.npmjs.org/@jimp/plugin-fisheye/-/plugin-fisheye-0.9.8.tgz" - integrity sha512-VnsalrD05f4pxG1msjnkwIFi5QveOqRm4y7VkoZKNX+iqs4TvRnH5+HpBnfdMzX/RXBi+Lf/kpTtuZgbOu/QWw== +"@jimp/plugin-fisheye@^0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-fisheye/-/plugin-fisheye-0.16.1.tgz#f625047b6cdbe1b83b89e9030fd025ab19cdb1a4" + integrity sha512-BWHnc5hVobviTyIRHhIy9VxI1ACf4CeSuCfURB6JZm87YuyvgQh5aX5UDKtOz/3haMHXBLP61ZBxlNpMD8CG4A== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.8" - core-js "^3.4.1" + "@jimp/utils" "^0.16.1" -"@jimp/plugin-flip@^0.9.8": - version "0.9.8" - resolved "https://registry.npmjs.org/@jimp/plugin-flip/-/plugin-flip-0.9.8.tgz" - integrity sha512-XbiZ4OfHD6woc0f6Sk7XxB6a7IyMjTRQ4pNU7APjaNxsl3L6qZC8qfCQphWVe3DHx7f3y7jEiPMvNnqRDP1xgA== +"@jimp/plugin-flip@^0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-flip/-/plugin-flip-0.16.1.tgz#7a99ea22bde802641017ed0f2615870c144329bb" + integrity sha512-KdxTf0zErfZ8DyHkImDTnQBuHby+a5YFdoKI/G3GpBl3qxLBvC+PWkS2F/iN3H7wszP7/TKxTEvWL927pypT0w== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.8" - core-js "^3.4.1" + "@jimp/utils" "^0.16.1" -"@jimp/plugin-gaussian@^0.9.8": - version "0.9.8" - resolved "https://registry.npmjs.org/@jimp/plugin-gaussian/-/plugin-gaussian-0.9.8.tgz" - integrity sha512-ZBl5RA6+4XAD+mtqLfiG7u+qd8W5yqq3RBNca8eFqUSVo1v+eB2tzeLel0CWfVC/z6cw93Awm/nVnm6/CL2Oew== +"@jimp/plugin-gaussian@^0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-gaussian/-/plugin-gaussian-0.16.1.tgz#0845e314085ccd52e34fad9a83949bc0d81a68e8" + integrity sha512-u9n4wjskh3N1mSqketbL6tVcLU2S5TEaFPR40K6TDv4phPLZALi1Of7reUmYpVm8mBDHt1I6kGhuCJiWvzfGyg== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.8" - core-js "^3.4.1" + "@jimp/utils" "^0.16.1" -"@jimp/plugin-invert@^0.9.8": - version "0.9.8" - resolved "https://registry.npmjs.org/@jimp/plugin-invert/-/plugin-invert-0.9.8.tgz" - integrity sha512-ESploqCoF6qUv5IWhVLaO5fEcrYZEsAWPFflh6ROiD2mmFKQxfeK+vHnk3IDLHtUwWTkAZQNbk89BVq7xvaNpQ== +"@jimp/plugin-invert@^0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-invert/-/plugin-invert-0.16.1.tgz#7e6f5a15707256f3778d06921675bbcf18545c97" + integrity sha512-2DKuyVXANH8WDpW9NG+PYFbehzJfweZszFYyxcaewaPLN0GxvxVLOGOPP1NuUTcHkOdMFbE0nHDuB7f+sYF/2w== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.8" - core-js "^3.4.1" + "@jimp/utils" "^0.16.1" -"@jimp/plugin-mask@^0.9.8": - version "0.9.8" - resolved "https://registry.npmjs.org/@jimp/plugin-mask/-/plugin-mask-0.9.8.tgz" - integrity sha512-zSvEisTV4iGsBReitEdnQuGJq9/1xB5mPATadYZmIlp8r5HpD72HQb0WdEtb51/pu9Odt8KAxUf0ASg/PRVUiQ== +"@jimp/plugin-mask@^0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-mask/-/plugin-mask-0.16.1.tgz#e7f2460e05c3cda7af5e76f33ccb0579f66f90df" + integrity sha512-snfiqHlVuj4bSFS0v96vo2PpqCDMe4JB+O++sMo5jF5mvGcGL6AIeLo8cYqPNpdO6BZpBJ8MY5El0Veckhr39Q== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.8" - core-js "^3.4.1" + "@jimp/utils" "^0.16.1" -"@jimp/plugin-normalize@^0.9.8": - version "0.9.8" - resolved "https://registry.npmjs.org/@jimp/plugin-normalize/-/plugin-normalize-0.9.8.tgz" - integrity sha512-dPFBfwTa67K1tRw1leCidQT25R3ozrTUUOpO4jcGFHqXvBTWaR8sML1qxdfOBWs164mE5YpfdTvu6MM/junvCg== +"@jimp/plugin-normalize@^0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-normalize/-/plugin-normalize-0.16.1.tgz#032dfd88eefbc4dedc8b1b2d243832e4f3af30c8" + integrity sha512-dOQfIOvGLKDKXPU8xXWzaUeB0nvkosHw6Xg1WhS1Z5Q0PazByhaxOQkSKgUryNN/H+X7UdbDvlyh/yHf3ITRaw== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.8" - core-js "^3.4.1" + "@jimp/utils" "^0.16.1" -"@jimp/plugin-print@^0.9.8": - version "0.9.8" - resolved "https://registry.npmjs.org/@jimp/plugin-print/-/plugin-print-0.9.8.tgz" - integrity sha512-nLLPv1/faehRsOjecXXUb6kzhRcZzImO55XuFZ0c90ZyoiHm4UFREwO5sKxHGvpLXS6RnkhvSav4+IWD2qGbEQ== +"@jimp/plugin-print@^0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-print/-/plugin-print-0.16.1.tgz#66b803563f9d109825970714466e6ab9ae639ff6" + integrity sha512-ceWgYN40jbN4cWRxixym+csyVymvrryuKBQ+zoIvN5iE6OyS+2d7Mn4zlNgumSczb9GGyZZESIgVcBDA1ezq0Q== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.8" - core-js "^3.4.1" + "@jimp/utils" "^0.16.1" load-bmfont "^1.4.0" -"@jimp/plugin-resize@^0.9.8": - version "0.9.8" - resolved "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-0.9.8.tgz" - integrity sha512-L80NZ+HKsiKFyeDc6AfneC4+5XACrdL2vnyAVfAAsb3pmamgT/jDInWvvGhyI0Y76vx2w6XikplzEznW/QQvWg== +"@jimp/plugin-resize@^0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-resize/-/plugin-resize-0.16.1.tgz#65e39d848ed13ba2d6c6faf81d5d590396571d10" + integrity sha512-u4JBLdRI7dargC04p2Ha24kofQBk3vhaf0q8FwSYgnCRwxfvh2RxvhJZk9H7Q91JZp6wgjz/SjvEAYjGCEgAwQ== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.8" - core-js "^3.4.1" + "@jimp/utils" "^0.16.1" -"@jimp/plugin-rotate@^0.9.8": - version "0.9.8" - resolved "https://registry.npmjs.org/@jimp/plugin-rotate/-/plugin-rotate-0.9.8.tgz" - integrity sha512-bpqzQheISYnBXKyU1lIj46uR7mRs0UhgEREWK70HnvFJSlRshdcoNMIrKamyrJeFdJrkYPSfR/a6D0d5zsWf1Q== +"@jimp/plugin-rotate@^0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-rotate/-/plugin-rotate-0.16.1.tgz#53fb5d51a4b3d05af9c91c2a8fffe5d7a1a47c8c" + integrity sha512-ZUU415gDQ0VjYutmVgAYYxC9Og9ixu2jAGMCU54mSMfuIlmohYfwARQmI7h4QB84M76c9hVLdONWjuo+rip/zg== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.8" - core-js "^3.4.1" + "@jimp/utils" "^0.16.1" -"@jimp/plugin-scale@^0.9.8": - version "0.9.8" - resolved "https://registry.npmjs.org/@jimp/plugin-scale/-/plugin-scale-0.9.8.tgz" - integrity sha512-QU3ZS4Lre8nN66U9dKCOC4FNfaOh/QJFYUmQPKpPS924oYbtnm4OlmsdfpK2hVMSVVyVOis8M+xpA1rDBnIp7w== +"@jimp/plugin-scale@^0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-scale/-/plugin-scale-0.16.1.tgz#89f6ba59feed3429847ed226aebda33a240cc647" + integrity sha512-jM2QlgThIDIc4rcyughD5O7sOYezxdafg/2Xtd1csfK3z6fba3asxDwthqPZAgitrLgiKBDp6XfzC07Y/CefUw== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.8" - core-js "^3.4.1" + "@jimp/utils" "^0.16.1" -"@jimp/plugin-shadow@^0.9.8": - version "0.9.8" - resolved "https://registry.npmjs.org/@jimp/plugin-shadow/-/plugin-shadow-0.9.8.tgz" - integrity sha512-t/pE+QS3r1ZUxGIQNmwWDI3c5+/hLU+gxXD+C3EEC47/qk3gTBHpj/xDdGQBoObdT/HRjR048vC2BgBfzjj2hg== +"@jimp/plugin-shadow@^0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-shadow/-/plugin-shadow-0.16.1.tgz#a7af892a740febf41211e10a5467c3c5c521a04c" + integrity sha512-MeD2Is17oKzXLnsphAa1sDstTu6nxscugxAEk3ji0GV1FohCvpHBcec0nAq6/czg4WzqfDts+fcPfC79qWmqrA== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.8" - core-js "^3.4.1" + "@jimp/utils" "^0.16.1" -"@jimp/plugin-threshold@^0.9.8": - version "0.9.8" - resolved "https://registry.npmjs.org/@jimp/plugin-threshold/-/plugin-threshold-0.9.8.tgz" - integrity sha512-WWmC3lnIwOTPvkKu55w4DUY8Ehlzf3nU98bY0QtIzkqxkAOZU5m+lvgC/JxO5FyGiA57j9FLMIf0LsWkjARj7g== +"@jimp/plugin-threshold@^0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@jimp/plugin-threshold/-/plugin-threshold-0.16.1.tgz#34f3078f9965145b7ae26c53a32ad74b1195bbf5" + integrity sha512-iGW8U/wiCSR0+6syrPioVGoSzQFt4Z91SsCRbgNKTAk7D+XQv6OI78jvvYg4o0c2FOlwGhqz147HZV5utoSLxA== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.8" - core-js "^3.4.1" + "@jimp/utils" "^0.16.1" -"@jimp/plugins@^0.9.8": - version "0.9.8" - resolved "https://registry.npmjs.org/@jimp/plugins/-/plugins-0.9.8.tgz" - integrity sha512-tD+cxS9SuEZaQ1hhAkNKw9TkUAqfoBAhdWPBrEZDr/GvGPrvJR4pYmmpSYhc5IZmMbXfQayHTTGqjj8D18bToA== +"@jimp/plugins@^0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@jimp/plugins/-/plugins-0.16.1.tgz#9f08544c97226d6460a16ced79f57e85bec3257b" + integrity sha512-c+lCqa25b+4q6mJZSetlxhMoYuiltyS+ValLzdwK/47+aYsq+kcJNl+TuxIEKf59yr9+5rkbpsPkZHLF/V7FFA== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/plugin-blit" "^0.9.8" - "@jimp/plugin-blur" "^0.9.8" - "@jimp/plugin-circle" "^0.9.8" - "@jimp/plugin-color" "^0.9.8" - "@jimp/plugin-contain" "^0.9.8" - "@jimp/plugin-cover" "^0.9.8" - "@jimp/plugin-crop" "^0.9.8" - "@jimp/plugin-displace" "^0.9.8" - "@jimp/plugin-dither" "^0.9.8" - "@jimp/plugin-fisheye" "^0.9.8" - "@jimp/plugin-flip" "^0.9.8" - "@jimp/plugin-gaussian" "^0.9.8" - "@jimp/plugin-invert" "^0.9.8" - "@jimp/plugin-mask" "^0.9.8" - "@jimp/plugin-normalize" "^0.9.8" - "@jimp/plugin-print" "^0.9.8" - "@jimp/plugin-resize" "^0.9.8" - "@jimp/plugin-rotate" "^0.9.8" - "@jimp/plugin-scale" "^0.9.8" - "@jimp/plugin-shadow" "^0.9.8" - "@jimp/plugin-threshold" "^0.9.8" - core-js "^3.4.1" + "@jimp/plugin-blit" "^0.16.1" + "@jimp/plugin-blur" "^0.16.1" + "@jimp/plugin-circle" "^0.16.1" + "@jimp/plugin-color" "^0.16.1" + "@jimp/plugin-contain" "^0.16.1" + "@jimp/plugin-cover" "^0.16.1" + "@jimp/plugin-crop" "^0.16.1" + "@jimp/plugin-displace" "^0.16.1" + "@jimp/plugin-dither" "^0.16.1" + "@jimp/plugin-fisheye" "^0.16.1" + "@jimp/plugin-flip" "^0.16.1" + "@jimp/plugin-gaussian" "^0.16.1" + "@jimp/plugin-invert" "^0.16.1" + "@jimp/plugin-mask" "^0.16.1" + "@jimp/plugin-normalize" "^0.16.1" + "@jimp/plugin-print" "^0.16.1" + "@jimp/plugin-resize" "^0.16.1" + "@jimp/plugin-rotate" "^0.16.1" + "@jimp/plugin-scale" "^0.16.1" + "@jimp/plugin-shadow" "^0.16.1" + "@jimp/plugin-threshold" "^0.16.1" timm "^1.6.1" -"@jimp/png@^0.9.8": - version "0.9.8" - resolved "https://registry.npmjs.org/@jimp/png/-/png-0.9.8.tgz" - integrity sha512-9CqR8d40zQCDhbnXHqcwkAMnvlV0vk9xSyE6LHjkYHS7x18Unsz5txQdsaEkEcXxCrOQSoWyITfLezlrWXRJAA== +"@jimp/png@^0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@jimp/png/-/png-0.16.1.tgz#f24cfc31529900b13a2dd9d4fdb4460c1e4d814e" + integrity sha512-iyWoCxEBTW0OUWWn6SveD4LePW89kO7ZOy5sCfYeDM/oTPLpR8iMIGvZpZUz1b8kvzFr27vPst4E5rJhGjwsdw== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.8" - core-js "^3.4.1" + "@jimp/utils" "^0.16.1" pngjs "^3.3.3" -"@jimp/tiff@^0.9.8": - version "0.9.8" - resolved "https://registry.npmjs.org/@jimp/tiff/-/tiff-0.9.8.tgz" - integrity sha512-eMxcpJivJqMByn2dZxUHLeh6qvVs5J/52kBF3TFa3C922OJ97D9l1C1h0WKUCBqFMWzMYapQQ4vwnLgpJ5tkow== +"@jimp/tiff@^0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@jimp/tiff/-/tiff-0.16.1.tgz#0e8756695687d7574b6bc73efab0acd4260b7a12" + integrity sha512-3K3+xpJS79RmSkAvFMgqY5dhSB+/sxhwTFA9f4AVHUK0oKW+u6r52Z1L0tMXHnpbAdR9EJ+xaAl2D4x19XShkQ== dependencies: "@babel/runtime" "^7.7.2" - core-js "^3.4.1" utif "^2.0.1" -"@jimp/types@^0.9.8": - version "0.9.8" - resolved "https://registry.npmjs.org/@jimp/types/-/types-0.9.8.tgz" - integrity sha512-H5y/uqt0lqJ/ZN8pWqFG+pv8jPAppMKkTMByuC8YBIjWSsornwv44hjiWl93sbYhduLZY8ubz/CbX9jH2X6EwA== +"@jimp/types@^0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@jimp/types/-/types-0.16.1.tgz#0dbab37b3202315c91010f16c31766d35a2322cc" + integrity sha512-g1w/+NfWqiVW4CaXSJyD28JQqZtm2eyKMWPhBBDCJN9nLCN12/Az0WFF3JUAktzdsEC2KRN2AqB1a2oMZBNgSQ== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/bmp" "^0.9.8" - "@jimp/gif" "^0.9.8" - "@jimp/jpeg" "^0.9.8" - "@jimp/png" "^0.9.8" - "@jimp/tiff" "^0.9.8" - core-js "^3.4.1" + "@jimp/bmp" "^0.16.1" + "@jimp/gif" "^0.16.1" + "@jimp/jpeg" "^0.16.1" + "@jimp/png" "^0.16.1" + "@jimp/tiff" "^0.16.1" timm "^1.6.1" -"@jimp/utils@^0.9.8": - version "0.9.8" - resolved "https://registry.npmjs.org/@jimp/utils/-/utils-0.9.8.tgz" - integrity sha512-UK0Fu0eevQlpRXq5ff4o/71HJlpX9wJMddJjMYg9vUqCCl8ZnumRAljfShHFhGyO+Vc9IzN6dd8Y5JZZTp1KOw== +"@jimp/utils@^0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@jimp/utils/-/utils-0.16.1.tgz#2f51e6f14ff8307c4aa83d5e1a277da14a9fe3f7" + integrity sha512-8fULQjB0x4LzUSiSYG6ZtQl355sZjxbv8r9PPAuYHzS9sGiSHJQavNqK/nKnpDsVkU88/vRGcE7t3nMU0dEnVw== dependencies: "@babel/runtime" "^7.7.2" - core-js "^3.4.1" + regenerator-runtime "^0.13.3" "@mrmlnc/readdir-enhanced@^2.2.1": version "2.2.1" @@ -2315,9 +2286,9 @@ argparse@^1.0.7: dependencies: sprintf-js "~1.0.2" -args@^5.0.0: +args@^5.0.1: version "5.0.1" - resolved "https://registry.npmjs.org/args/-/args-5.0.1.tgz" + resolved "https://registry.yarnpkg.com/args/-/args-5.0.1.tgz#4bf298df90a4799a09521362c579278cc2fdd761" integrity sha512-1kqmFCFsPffavQFGt8OxJdIcETti99kySRUPMpOhaGjL6mRJn8HFU1OxKY5bMqfZKUwTQc1mZkAjmGYaVOHFtQ== dependencies: camelcase "5.0.0" @@ -3807,7 +3778,7 @@ core-js@^2.4.0: resolved "https://registry.npm.taobao.org/core-js/download/core-js-2.6.11.tgz?cache=0&sync_timestamp=1589682726446&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcore-js%2Fdownload%2Fcore-js-2.6.11.tgz" integrity sha1-OIMUafmSK97Y7iHJ3EaYXgOZMIw= -core-js@^3.4.1, core-js@^3.6.5: +core-js@^3.6.5: version "3.6.5" resolved "https://registry.npm.taobao.org/core-js/download/core-js-3.6.5.tgz?cache=0&sync_timestamp=1589682726446&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcore-js%2Fdownload%2Fcore-js-3.6.5.tgz" integrity sha1-c5XcJzrzf7LlDpvT2f6EEoUjHRo= @@ -4613,14 +4584,14 @@ electron-devtools-installer@^3.1.0: semver "^7.2.1" unzip-crx-3 "^0.2.0" -electron-icon-builder@^1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/electron-icon-builder/-/electron-icon-builder-1.0.2.tgz" - integrity sha512-ti7Xp6UmOmq+AThfrnmPVaCiMYLWaVcyTVkPommmFHb4GkQhtOeTJtwtko+FnnC7RFBLo4MogDrz611lNdSVPw== +electron-icon-builder@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/electron-icon-builder/-/electron-icon-builder-2.0.1.tgz#f43171bde3074870158433aa6103497bc5249793" + integrity sha512-rg9BxW2kJi3TXsMFFNXWXrwQEd5dzXmeD+w7Pj3k3z7aYRePLxE89qU4lvL/rK1X/NTY5KDn3+Dbgm1TU2dGXQ== dependencies: - args "^5.0.0" + args "^5.0.1" icon-gen "^2.0.0" - jimp "^0.9.3" + jimp "^0.16.1" electron-publish@22.9.1: version "22.9.1" @@ -5787,6 +5758,14 @@ getpass@^0.1.1: dependencies: assert-plus "^1.0.0" +gifwrap@^0.9.2: + version "0.9.2" + resolved "https://registry.yarnpkg.com/gifwrap/-/gifwrap-0.9.2.tgz#348e286e67d7cf57942172e1e6f05a71cee78489" + integrity sha512-fcIswrPaiCDAyO8xnWvHSZdWChjKXUanKKpAiWWJ/UTkEi/aYKn5+90e7DE820zbEaVR9CE2y4z9bzhQijZ0BA== + dependencies: + image-q "^1.1.1" + omggif "^1.0.10" + glob-parent@^3.1.0: version "3.1.0" resolved "https://registry.npm.taobao.org/glob-parent/download/glob-parent-3.1.0.tgz" @@ -6344,6 +6323,11 @@ ignore@^5.1.1: resolved "https://registry.npm.taobao.org/ignore/download/ignore-5.1.8.tgz" integrity sha1-8VCotQo0KJsz4i9YiavU2AFvDlc= +image-q@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/image-q/-/image-q-1.1.1.tgz#fc84099664460b90ca862d9300b6bfbbbfbf8056" + integrity sha1-/IQJlmRGC5DKhi2TALa/u7+/gFY= + immediate@~3.0.5: version "3.0.6" resolved "https://registry.npm.taobao.org/immediate/download/immediate-3.0.6.tgz" @@ -6950,22 +6934,21 @@ jest-worker@^26.2.1: merge-stream "^2.0.0" supports-color "^7.0.0" -jimp@^0.9.3: - version "0.9.8" - resolved "https://registry.npmjs.org/jimp/-/jimp-0.9.8.tgz" - integrity sha512-DHN4apKMwLIvD/TKO9tFfPuankNuVK98vCwHm/Jv9z5cJnrd38xhi+4I7IAGmDU3jIDlrEVhzTkFH1Ymv5yTQQ== +jimp@^0.16.1: + version "0.16.1" + resolved "https://registry.yarnpkg.com/jimp/-/jimp-0.16.1.tgz#192f851a30e5ca11112a3d0aa53137659a78ca7a" + integrity sha512-+EKVxbR36Td7Hfd23wKGIeEyHbxShZDX6L8uJkgVW3ESA9GiTEPK08tG1XI2r/0w5Ch0HyJF5kPqF9K7EmGjaw== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/custom" "^0.9.8" - "@jimp/plugins" "^0.9.8" - "@jimp/types" "^0.9.8" - core-js "^3.4.1" + "@jimp/custom" "^0.16.1" + "@jimp/plugins" "^0.16.1" + "@jimp/types" "^0.16.1" regenerator-runtime "^0.13.3" -jpeg-js@^0.3.4: - version "0.3.7" - resolved "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.3.7.tgz" - integrity sha512-9IXdWudL61npZjvLuVe/ktHiA41iE8qFyLB+4VDTblEsWBzeg8WQTlktdUK4CdncUqtUgUg0bbOmTE2bKBKaBQ== +jpeg-js@0.4.2: + version "0.4.2" + resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.4.2.tgz#8b345b1ae4abde64c2da2fe67ea216a114ac279d" + integrity sha512-+az2gi/hvex7eLTMTlbRLOhH6P6WFdk2ITI8HJsaH2VqYO0I594zXSYEP+tf4FW+8Cy68ScDXoAsQdyQanv3sw== js-message@1.0.5: version "1.0.5" @@ -8169,7 +8152,7 @@ obuf@^1.0.0, obuf@^1.1.2: resolved "https://registry.npm.taobao.org/obuf/download/obuf-1.1.2.tgz" integrity sha1-Cb6jND1BhZ69RGKS0RydTbYZCE4= -omggif@^1.0.9: +omggif@^1.0.10, omggif@^1.0.9: version "1.0.10" resolved "https://registry.npmjs.org/omggif/-/omggif-1.0.10.tgz" integrity sha512-LMJTtvgc/nugXj0Vcrrs68Mn2D1r0zf630VNtqtpI1FEO7e+O9FP4gqs9AcnBaSEeoHIPm28u6qgPR0oyEpGSw==