From 3a76aa0812383589330dcabf5bab423ef1524d54 Mon Sep 17 00:00:00 2001 From: Mikael Finstad Date: Tue, 31 Mar 2020 13:11:55 +0800 Subject: [PATCH] - Support Mac app store - Disable version check for Mac app store and windows store - restore windows targets --- .github/workflows/build.yml | 15 +- .gitignore | 2 +- ...tore_provisioning_profile.provisionprofile | Bin 0 -> 7659 bytes entitlements.mas.inherit.plist | 10 + entitlements.mas.loginhelper.plist | 8 + entitlements.mas.plist | 16 + package.json | 26 +- public/electron.js | 8 +- src/App.jsx | 26 +- src/util.js | 11 + yarn.lock | 302 +++++++++--------- 11 files changed, 264 insertions(+), 160 deletions(-) create mode 100644 LosslessCut_Mac_App_Store_provisioning_profile.provisionprofile create mode 100644 entitlements.mas.inherit.plist create mode 100644 entitlements.mas.loginhelper.plist create mode 100644 entitlements.mas.plist diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c5c6801..cd258f7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: # os: [macos-latest, ubuntu-latest, windows-latest] - os: [windows-latest] + os: [macos-latest] steps: - name: Check out Git repository @@ -20,7 +20,7 @@ jobs: with: node-version: 12 - - name: Install Snapcraft + - name: Install and login to Snapcraft uses: samuelmeuli/action-snapcraft@v1 if: startsWith(matrix.os, 'ubuntu') with: @@ -48,9 +48,16 @@ jobs: mac_certs: ${{ secrets.mac_certs }} mac_certs_password: ${{ secrets.mac_certs_password }} -# windows_certs: ${{ secrets.windows_certs }} -# windows_certs_password: ${{ secrets.windows_certs_password }} + windows_certs: ${{ secrets.windows_certs }} + windows_certs_password: ${{ secrets.windows_certs_password }} env: # macOS notarization API key API_KEY_ID: ${{ secrets.api_key_id }} API_KEY_ISSUER_ID: ${{ secrets.api_key_issuer_id }} + + - name: Upload to Mac App Store + if: startsWith(matrix.os, 'macos') + run: | + mkdir -p ~/.appstoreconnect/private_keys/ + echo '${{ secrets.api_key }}' > ~/.appstoreconnect/private_keys/AuthKey_${{ secrets.api_key_id }}.p8 + xcrun altool --upload-app -f dist/mas/LosslessCut-mac.pkg --apiKey ${{ secrets.api_key_id }} --apiIssuer ${{ secrets.api_key_issuer_id }} diff --git a/.gitignore b/.gitignore index cb99283..544c46a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,5 @@ node_modules .DS_Store dist build -watch-build icon-build +icns-build diff --git a/LosslessCut_Mac_App_Store_provisioning_profile.provisionprofile b/LosslessCut_Mac_App_Store_provisioning_profile.provisionprofile new file mode 100644 index 0000000000000000000000000000000000000000..20f4391e9a6688fe5782f0702f77e08adf2e4034 GIT binary patch literal 7659 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 GH1faSv|^h8 literal 0 HcmV?d00001 diff --git a/entitlements.mas.inherit.plist b/entitlements.mas.inherit.plist new file mode 100644 index 0000000..794eada --- /dev/null +++ b/entitlements.mas.inherit.plist @@ -0,0 +1,10 @@ + + + + + com.apple.security.app-sandbox + + com.apple.security.inherit + + + diff --git a/entitlements.mas.loginhelper.plist b/entitlements.mas.loginhelper.plist new file mode 100644 index 0000000..1b44cd3 --- /dev/null +++ b/entitlements.mas.loginhelper.plist @@ -0,0 +1,8 @@ + + + + + com.apple.security.app-sandbox + + + diff --git a/entitlements.mas.plist b/entitlements.mas.plist new file mode 100644 index 0000000..23c0b9d --- /dev/null +++ b/entitlements.mas.plist @@ -0,0 +1,16 @@ + + + + + com.apple.security.app-sandbox + + com.apple.security.application-groups + + 46F6T3M669.no.mifi.losslesscut-mac + + com.apple.security.network.client + + com.apple.security.files.user-selected.read-write + + + diff --git a/package.json b/package.json index 13f0d09..7c486fc 100644 --- a/package.json +++ b/package.json @@ -3,12 +3,12 @@ "productName": "LosslessCut", "description": "The swiss army knife of lossless video/audio editing", "copyright": "Copyright © 2020 ${author}", - "version": "3.17.14", + "version": "3.17.15", "main": "public/electron.js", "homepage": "./", "scripts": { "start": "concurrently -k \"BROWSER=none PORT=3001 react-scripts start\" \"wait-on http://localhost:3001 && electron .\"", - "icon-gen": "mkdir -p icon-build && svg2png src/icon.svg -o ./icon-build/app-512.png -w 512 -h 512", + "icon-gen": "mkdir -p icon-build && svg2png src/icon.svg -o ./icon-build/app-512.png -w 512 -h 512 && mkdir -p icns-build && icon-gen -i src/icon.svg -o ./icns-build --icns --icns-sizes 512,1024", "build": "yarn icon-gen && react-scripts build", "test": "react-scripts test", "eject": "react-scripts eject", @@ -52,6 +52,7 @@ "framer-motion": "^1.8.4", "hammerjs": "^2.0.8", "i18next": "^19.3.2", + "icon-gen": "^2.0.0", "lodash": "^4.17.13", "moment": "^2.18.1", "mousetrap": "^1.6.1", @@ -117,15 +118,32 @@ "afterSign": "electron-builder-notarize", "mac": { "hardenedRuntime": true, - "target": "dmg", + "appId": "no.mifi.losslesscut-mac", + "category": "public.app-category.productivity", + "target": [ + "mas", + "dmg" + ], "extraResources": [ "node_modules/ffmpeg-static/ffmpeg", "node_modules/ffprobe-static/bin/darwin/**" ], - "icon": "icon-build/app-512.png" + "icon": "icns-build/app.icns" + }, + "mas": { + "hardenedRuntime": false, + "entitlements": "entitlements.mas.plist", + "entitlementsInherit": "entitlements.mas.inherit.plist", + "provisioningProfile": "LosslessCut_Mac_App_Store_provisioning_profile.provisionprofile", + "binaries": [ + "dist/mas/LosslessCut.app/Contents/Resources/node_modules/ffmpeg-static/ffmpeg", + "dist/mas/LosslessCut.app/Contents/Resources/node_modules/ffprobe-static/bin/darwin/x64/ffprobe" + ] }, "win": { "target": [ + "portable", + "zip", "appx" ], "extraResources": [ diff --git a/public/electron.js b/public/electron.js index ad405df..eaff4fa 100644 --- a/public/electron.js +++ b/public/electron.js @@ -71,9 +71,11 @@ app.on('ready', async () => { createWindow(); menu(app, mainWindow); - const newVersion = await checkNewVersion(); - if (newVersion) { - menu(app, mainWindow, newVersion); + if (!process.windowsStore && !process.mas) { + const newVersion = await checkNewVersion(); + if (newVersion) { + menu(app, mainWindow, newVersion); + } } }); diff --git a/src/App.jsx b/src/App.jsx index d070f89..80d39ad 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -46,7 +46,7 @@ import configStore from './store'; import { save as edlStoreSave, load as edlStoreLoad } from './edlStore'; import { getOutPath, formatDuration, toast, errorToast, showFfmpegFail, setFileNameTitle, - promptTimeOffset, generateColor, getOutDir, withBlur, + promptTimeOffset, generateColor, getOutDir, withBlur, checkDirWriteAccess, } from './util'; @@ -1167,6 +1167,30 @@ const App = memo(() => { const firstFile = filePaths[0]; + const outDirPath = getOutDir(customOutDir, firstFile); + const hasDirWriteAccess = await checkDirWriteAccess(outDirPath); + if (!hasDirWriteAccess) { + if (window.process.mas) { + await Swal.fire({ + title: i18n.t('Mac OS file security'), + icon: 'info', + text: i18n.t('Mac OS requires you to choose the folder where the output files should be saved. This is only required the first time for each folder. Simply press "Open" in the next dialog to allow access to the default folder.'), + }); + + // TODO check that correct dir is selected + // TODO also when customoutdir changes + // eslint-disable-next-line no-unused-vars + const { canceled, filePaths: filePaths2 } = await dialog.showOpenDialog({ + title: 'Select file to open', + defaultPath: outDirPath, + properties: ['openDirectory'], + }); + if (canceled) return; + } else { + errorToast(i18n.t('You have no write access to the directory of this file, please select a custom working dir')); + } + } + if (!isFileOpened) { load(firstFile); return; diff --git a/src/util.js b/src/util.js index 47ddc19..9973e17 100644 --- a/src/util.js +++ b/src/util.js @@ -52,6 +52,17 @@ export function getOutPath(customOutDir, filePath, nameSuffix) { return path.join(getOutDir(customOutDir, filePath), `${parsed.name}-${nameSuffix}`); } +export async function checkDirWriteAccess(dirPath) { + try { + await fs.access(dirPath, fs.constants.W_OK); + } catch (err) { + if (err.code === 'EPERM') return false; + // if (err.code === 'EACCES') return false; + console.error(err); + } + return true; +} + export async function transferTimestamps(inPath, outPath) { try { const stat = await fs.stat(inPath); diff --git a/yarn.lock b/yarn.lock index 8c730c5..ca2487d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1587,10 +1587,10 @@ resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7" integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g== -"@types/fs-extra@^8.0.1": - version "8.0.1" - resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.0.1.tgz#a2378d6e7e8afea1564e44aafa2e207dadf77686" - integrity sha512-J00cVDALmi/hJOYsunyT52Hva5TnJeKP5yd1r+mH/ZU0mbYZflR0Z5kw5kITtKTRYMhm1JMClOFYdHnQszEvqw== +"@types/fs-extra@^8.1.0": + version "8.1.0" + resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.1.0.tgz#1114834b53c3914806cd03b3304b37b3bd221a4d" + integrity sha512-UoOfVEzAUpeSPmjm7h1uk5MH6KZma2z2O7a75onTGjnNvAvMVrPzPL/vBbT65iIGHWj6rokwfmYcmxmlSf2uwg== dependencies: "@types/node" "*" @@ -1693,6 +1693,13 @@ dependencies: "@types/yargs-parser" "*" +"@types/yargs@^15.0.4": + version "15.0.4" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.4.tgz#7e5d0f8ca25e9d5849f2ea443cf7c402decd8299" + integrity sha512-9T1auFmbPZoxHz0enUFlUuKRy3it01R+hlggyVUMtnCTQRunsQYifnSGb8hET4Xo8yiC0o0r1paW3ud5+rbURg== + dependencies: + "@types/yargs-parser" "*" + "@typescript-eslint/eslint-plugin@^2.10.0": version "2.22.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.22.0.tgz#218ce6d4aa0244c6a40baba39ca1e021b26bb017" @@ -2087,66 +2094,38 @@ anymatch@~3.1.1: normalize-path "^3.0.0" picomatch "^2.0.4" -app-builder-bin@3.5.2: - version "3.5.2" - resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.2.tgz#fba56e6e9ef76fcd37816738c5f9a0b3992d7183" - integrity sha512-tYeNHp8js5c5MT+mzGEMsZhDBXRVAkCgrvz80rzNLlCojG6YrNLRSzfCWZiKJCv5W2faHjxTkKQoRAMY3RWaow== +app-builder-bin@3.5.5: + version "3.5.5" + resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.5.tgz#c83200dccd8df5ccb2a5adcd41b2a76bacfb531a" + integrity sha512-ZcHzJ9Xl+azPqdKzXZKdRZmkNmbxHHZyl4cbobNf8qMQpoPChpcov8riVrZSbu/0cT/JqJ8LOwJjy1OAwbChaQ== -app-builder-lib@22.3.2: - version "22.3.2" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.3.2.tgz#d43e0bdff91d484c0bd07d7248043dbb2665b8ac" - integrity sha512-QHaDelJUP3R+HUmnQJzHvjlCCJGG6t0bcFSZTOtUx+44B42VxzKpxtoG55xRFbyrU5l2++n7dQqEZAGk8iL6Qg== +app-builder-lib@22.4.1, app-builder-lib@~22.4.1: + version "22.4.1" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.4.1.tgz#9d73b2834e434fb65fc9571ae3fed3c1470b6915" + integrity sha512-epwUzIM+2pcdy/If9koTP74CKx4v7xGPj75a2Z5cM4rrGN9yVZ3eDUBbfF0e0qE4Qmcv5pd0BAZJ26bGm8NWsQ== dependencies: "7zip-bin" "~5.0.3" "@develar/schema-utils" "~2.1.0" async-exit-hook "^2.0.1" bluebird-lst "^1.0.9" - builder-util "22.3.2" - builder-util-runtime "8.6.0" + builder-util "22.4.1" + builder-util-runtime "8.6.2" chromium-pickle-js "^0.2.0" debug "^4.1.1" ejs "^3.0.1" - electron-publish "22.3.2" + electron-publish "22.4.1" fs-extra "^8.1.0" - hosted-git-info "^3.0.2" + hosted-git-info "^3.0.4" is-ci "^2.0.0" isbinaryfile "^4.0.4" js-yaml "^3.13.1" lazy-val "^1.0.4" minimatch "^3.0.4" normalize-package-data "^2.5.0" - read-config-file "5.0.1" + read-config-file "5.0.2" sanitize-filename "^1.6.3" - semver "^7.1.1" - temp-file "^3.3.6" - -app-builder-lib@~22.3.2: - version "22.3.3" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.3.3.tgz#9a95a3c14f69fb6131834dd840fba561191c9998" - integrity sha512-zZJyuF3djIA5K6tbx8t3w40M0iVoBR6K2k4KMHOu96+ffmfvdlu+UrsvDqvP1N1cgwFoSSyvW/Hg9/SP12pnEQ== - dependencies: - "7zip-bin" "~5.0.3" - "@develar/schema-utils" "~2.1.0" - async-exit-hook "^2.0.1" - bluebird-lst "^1.0.9" - builder-util "22.3.3" - builder-util-runtime "8.6.0" - chromium-pickle-js "^0.2.0" - debug "^4.1.1" - ejs "^3.0.1" - electron-publish "22.3.3" - fs-extra "^8.1.0" - hosted-git-info "^3.0.2" - is-ci "^2.0.0" - isbinaryfile "^4.0.4" - js-yaml "^3.13.1" - lazy-val "^1.0.4" - minimatch "^3.0.4" - normalize-package-data "^2.5.0" - read-config-file "5.0.1" - sanitize-filename "^1.6.3" - semver "^7.1.1" - temp-file "^3.3.6" + semver "^7.1.3" + temp-file "^3.3.7" aproba@^1.1.1: version "1.2.0" @@ -2815,24 +2794,25 @@ buffer@^4.3.0: ieee754 "^1.1.4" isarray "^1.0.0" -builder-util-runtime@8.6.0: - version "8.6.0" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.6.0.tgz#b7007c30126da9a90e99932128d2922c8c178649" - integrity sha512-WTDhTUVrm7zkFyd6Qn7AXgmWifjpZ/fYnEdV3XCOIDMNNb/KPddBTbQ8bUlxxVeuOYlhGpcLUypG+4USdGL1ww== +builder-util-runtime@8.6.2: + version "8.6.2" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.6.2.tgz#8270e15b012d8d3b110f3e327b0fd8b0e07b1686" + integrity sha512-9QnIBISfhgQ2BxtRLidVqf/v5HD73vSKZDllpUmGd2L6VORGQk7cZAPmPtw4HQM3gPBelyVJ5yIjMNZ8xjmd1A== dependencies: debug "^4.1.1" sax "^1.2.4" -builder-util@22.3.2: - version "22.3.2" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.3.2.tgz#23c61aaf0f0006f994087b33a26e47cdaec7aa8d" - integrity sha512-jNeyA/AgyujE6NQLoEkERY/qrilFdCFAC6cBM1ylSnRuzlD1tQQCI3QJhuMJG/gLUCgyNsfFQhN0Mw6IqsDAqw== +builder-util@22.4.1, builder-util@~22.4.1: + version "22.4.1" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.4.1.tgz#49cce9f06a62cdccda66d5efa82077040fa1f462" + integrity sha512-+ysLc7cC4w6P7rBxmZ5X2aU3QvcwFoWCl1us+mcUKdsGmJAtFUMPJqueeptdxjyPrPShIUOKHzA8uk5A3d1fHg== dependencies: "7zip-bin" "~5.0.3" "@types/debug" "^4.1.5" - app-builder-bin "3.5.2" + "@types/fs-extra" "^8.1.0" + app-builder-bin "3.5.5" bluebird-lst "^1.0.9" - builder-util-runtime "8.6.0" + builder-util-runtime "8.6.2" chalk "^3.0.0" debug "^4.1.1" fs-extra "^8.1.0" @@ -2840,27 +2820,7 @@ builder-util@22.3.2: js-yaml "^3.13.1" source-map-support "^0.5.16" stat-mode "^1.0.0" - temp-file "^3.3.6" - -builder-util@22.3.3, builder-util@~22.3.2, builder-util@~22.3.3: - version "22.3.3" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.3.3.tgz#62f0527ceaa1a2e4a60596a9b38ad1ffe3e20ae6" - integrity sha512-VzQALenLDdeaz7hXaQgS9N0Xz3zlgkK64Dp2Vn61XTbhI0MgVneTeEKKDFwdBC/l7v0cHsOPeao/xeWmyznC2g== - dependencies: - "7zip-bin" "~5.0.3" - "@types/debug" "^4.1.5" - "@types/fs-extra" "^8.0.1" - app-builder-bin "3.5.2" - bluebird-lst "^1.0.9" - builder-util-runtime "8.6.0" - chalk "^3.0.0" - debug "^4.1.1" - fs-extra "^8.1.0" - is-ci "^2.0.0" - js-yaml "^3.13.1" - source-map-support "^0.5.16" - stat-mode "^1.0.0" - temp-file "^3.3.6" + temp-file "^3.3.7" builtin-modules@^1.0.0: version "1.1.1" @@ -3459,12 +3419,12 @@ config-chain@^1.1.11: ini "^1.3.4" proto-list "~1.2.1" -configstore@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.0.tgz#37de662c7a49b5fe8dbcf8f6f5818d2d81ed852b" - integrity sha512-eE/hvMs7qw7DlcB5JPRnthmrITuHMmACUJAp89v6PT6iOqzoLS7HRWhBtuHMlhNHo2AhUSA/3Dh1bKNJHcublQ== +configstore@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96" + integrity sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA== dependencies: - dot-prop "^5.1.0" + dot-prop "^5.2.0" graceful-fs "^4.1.2" make-dir "^3.0.0" unique-string "^2.0.0" @@ -4138,6 +4098,18 @@ define-property@^2.0.2: is-descriptor "^1.0.2" isobject "^3.0.1" +del@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5" + integrity sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU= + dependencies: + globby "^6.1.0" + is-path-cwd "^1.0.0" + is-path-in-cwd "^1.0.0" + p-map "^1.1.1" + pify "^3.0.0" + rimraf "^2.2.8" + del@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz#9e8f117222ea44a31ff3a156c049b99052a9f0b4" @@ -4214,14 +4186,14 @@ dir-glob@2.0.0, dir-glob@^2.0.0: arrify "^1.0.1" path-type "^3.0.0" -dmg-builder@22.3.2: - version "22.3.2" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.3.2.tgz#4c052f75d601e3358da1ff9d7d57738e1c01b157" - integrity sha512-szx+nmCNjpfp2yy3zVCMQLj2nRHL3LfZyzvQECDGHr0ZHK7//48+MoJckkbOCB22ofBvx5Y2M1YqCjK8b2slYQ== +dmg-builder@22.4.1: + version "22.4.1" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.4.1.tgz#ab80d3d6e4ed8a1d38beddbfe97c8f7a794dd932" + integrity sha512-hEemh7n0zoVt7zPPwvn7iOttP03oENjJ4ApttPmt8oDnX8T4q42MjGWyDlLkPMplMJfoTxkkNqmm296f0OYM8Q== dependencies: - app-builder-lib "~22.3.2" + app-builder-lib "~22.4.1" bluebird-lst "^1.0.9" - builder-util "~22.3.2" + builder-util "~22.4.1" fs-extra "^8.1.0" iconv-lite "^0.5.1" js-yaml "^3.13.1" @@ -4344,7 +4316,7 @@ dot-case@^3.0.3: no-case "^3.0.3" tslib "^1.10.0" -dot-prop@^5.0.0, dot-prop@^5.1.0, dot-prop@^5.2.0: +dot-prop@^5.0.0, dot-prop@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz#c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb" integrity sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A== @@ -4418,22 +4390,23 @@ electron-builder-notarize@^1.1.2: read-pkg-up "^7.0.0" electron-builder@^22.3.2: - version "22.3.2" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.3.2.tgz#902d150fc0670cb90213262e5e0aa3c4f299ffa4" - integrity sha512-bDjHfKtA4DapI6qqy4FC18fzLsOJtlSVGBqjSjhrgv+gbcppp3tjR6ASsUX5K64/8L9MGjhRGdfQ7iP78OLx8g== + version "22.4.1" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.4.1.tgz#7a7a2cbd9955c90cecc36de32ecba7f565265bab" + integrity sha512-13CjZcGeJS+c3EKRwFT/Oty5Niif5g1FwDioBLEbjkPCPQgxdtDsr+rJtCu9qxkiKDYpAoPS+t/clNk0efONvQ== dependencies: - app-builder-lib "22.3.2" + "@types/yargs" "^15.0.4" + app-builder-lib "22.4.1" bluebird-lst "^1.0.9" - builder-util "22.3.2" - builder-util-runtime "8.6.0" + builder-util "22.4.1" + builder-util-runtime "8.6.2" chalk "^3.0.0" - dmg-builder "22.3.2" + dmg-builder "22.4.1" fs-extra "^8.1.0" is-ci "^2.0.0" lazy-val "^1.0.4" - read-config-file "5.0.1" + read-config-file "5.0.2" sanitize-filename "^1.6.3" - update-notifier "^4.0.0" + update-notifier "^4.1.0" yargs "^15.1.0" electron-devtools-installer@^2.2.4: @@ -4459,28 +4432,15 @@ electron-notarize@^0.2.0: debug "^4.1.1" fs-extra "^8.1.0" -electron-publish@22.3.2: - version "22.3.2" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.3.2.tgz#d2e60caf7a9643fe57e501c20acaf32c737b1c50" - integrity sha512-nUGepzRtoGT8Tv83RHnnrR5szbw4+HpLLBdZU+aO5Kt3uoReTsp7NSm+agJfbI+H5rVpYCG8h6nPIejxGZ7LTg== +electron-publish@22.4.1: + version "22.4.1" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.4.1.tgz#a7fcf166786f7d5957f19a70ee8389f219769ba5" + integrity sha512-nwKNum3KXm+01rtWX2pc1jhazdzDy2zYnQx+zmXphZchjd6UOMX3ZN0xyZUCKugw5ZliflT6LkgbrcBXBtYD3A== dependencies: + "@types/fs-extra" "^8.1.0" bluebird-lst "^1.0.9" - builder-util "~22.3.2" - builder-util-runtime "8.6.0" - chalk "^3.0.0" - fs-extra "^8.1.0" - lazy-val "^1.0.4" - mime "^2.4.4" - -electron-publish@22.3.3: - version "22.3.3" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.3.3.tgz#7d1e757a20ce0558fdc42900b6e3d773fdae9d9e" - integrity sha512-QfdS6gyqdjX+JBm3DhRT8nwO2TKQF9Z2dsZBXxCfE+FXYe2XmxMXWeXY2vPBHxSOpBYeAYVIkBiNL+gWcSfA+w== - dependencies: - "@types/fs-extra" "^8.0.1" - bluebird-lst "^1.0.9" - builder-util "~22.3.3" - builder-util-runtime "8.6.0" + builder-util "~22.4.1" + builder-util-runtime "8.6.2" chalk "^3.0.0" fs-extra "^8.1.0" lazy-val "^1.0.4" @@ -4500,9 +4460,9 @@ electron-to-chromium@^1.3.341, electron-to-chromium@^1.3.363: integrity sha512-GCHQreWs4zhKA48FNXCjvpV4kTnKoLu2PSAfKX394g34NPvTs2pPh1+jzWitNwhmOYI8zIqt36ulRVRZUgqlfA== electron@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-8.0.0.tgz#b5f105cda6985ca2f2496de15e44b2bbb0c8e4f4" - integrity sha512-vBXUKRqTUq0jv1upvISdvScDDH3uCPwXj4eA5BeR3UDbJp2hOhq7eJxwjIQbfLQql98aYz4X6pSlzBnhfyQqHA== + version "8.2.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-8.2.0.tgz#f3e3de23a6178b5ad7baa70f4814d6332a3212c2" + integrity sha512-mnV43gKCrCUMHLmGws/DU/l8LhaxrFD53A4ofwtthdCqOZWGIdk1+eMphiVumXR5a3lC64XVvmXQ2k28i7F/zw== dependencies: "@electron/get" "^1.0.1" "@types/node" "^12.0.12" @@ -4694,6 +4654,11 @@ es6-symbol@^3.1.1, es6-symbol@~3.1.3: d "^1.0.1" ext "^1.1.2" +escape-goat@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675" + integrity sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q== + escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" @@ -6114,10 +6079,10 @@ hosted-git-info@^2.1.4: resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c" integrity sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg== -hosted-git-info@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.2.tgz#8b7e3bd114b59b51786f8bade0f39ddc80275a97" - integrity sha512-ezZMWtHXm7Eb7Rq4Mwnx2vs79WUx2QmRg3+ZqeGroKzfDO+EprOcgRPYghsOP9JuYBfK18VojmRTGCg8Ma+ktw== +hosted-git-info@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.4.tgz#be4973eb1fd2737b11c9c7c19380739bb249f60d" + integrity sha512-4oT62d2jwSDBbLLFLZE+1vPuQ1h8p9wjrJ8Mqx5TjsyWmBMV5B13eJqn8pvluqubLf3cJPTfiYCIwNwDNmzScQ== dependencies: lru-cache "^5.1.1" @@ -6317,6 +6282,17 @@ i18next@^19.3.2: dependencies: "@babel/runtime" "^7.3.1" +icon-gen@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/icon-gen/-/icon-gen-2.0.0.tgz#2ba21902305ebafc3e500e505c5d3076dc4fb91a" + integrity sha512-Asj0rWMoFDY3AHLsZdx8UgHX7AIh/9u5ZTXYWJYH+2n8HqHQr655ATdoa1yQLidmm2fnTYlob+Rm4zzrjWr5Bw== + dependencies: + del "^3.0.0" + mkdirp "^0.5.1" + pngjs-nozlib "^1.0.0" + svg2png "4.1.1" + uuid "^3.3.2" + iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@~0.4.13: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" @@ -6798,11 +6774,23 @@ is-obj@^2.0.0: resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== +is-path-cwd@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d" + integrity sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0= + is-path-cwd@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb" integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ== +is-path-in-cwd@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52" + integrity sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ== + dependencies: + is-path-inside "^1.0.0" + is-path-in-cwd@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz#bfe2dca26c69f397265a4009963602935a053acb" @@ -6810,6 +6798,13 @@ is-path-in-cwd@^2.0.0: dependencies: is-path-inside "^2.1.0" +is-path-inside@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036" + integrity sha1-jvW33lBDej/cprToZe96pVy0gDY= + dependencies: + path-is-inside "^1.0.1" + is-path-inside@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz#7c9810587d659a40d27bcdb4d5616eab059494b2" @@ -8897,6 +8892,11 @@ p-locate@^4.1.0: dependencies: p-limit "^2.2.0" +p-map@^1.1.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b" + integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA== + p-map@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175" @@ -9087,7 +9087,7 @@ path-is-absolute@^1.0.0: resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= -path-is-inside@^1.0.2: +path-is-inside@^1.0.1, path-is-inside@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM= @@ -9260,6 +9260,11 @@ pn@^1.0.0, pn@^1.1.0: resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb" integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA== +pngjs-nozlib@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/pngjs-nozlib/-/pngjs-nozlib-1.0.0.tgz#9e64d602cfe9cce4d9d5997d0687429a73f0b7d7" + integrity sha1-nmTWAs/pzOTZ1Zl9BodCmnPwt9c= + pnp-webpack-plugin@1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.0.tgz#d5c068013a2fdc82224ca50ed179c8fba9036a8e" @@ -10158,6 +10163,13 @@ punycode@^2.1.0, punycode@^2.1.1: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== +pupa@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.0.1.tgz#dbdc9ff48ffbea4a26a069b6f9f7abb051008726" + integrity sha512-hEJH0s8PXLY/cdXh66tNEQGndDrIKNqNC5xmrysZy3i5C3oEoLna7YAOad+7u125+zH1HNXUmGEkrhb3c2VriA== + dependencies: + escape-goat "^2.0.0" + q@^1.1.2: version "1.5.1" resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" @@ -10487,10 +10499,10 @@ read-chunk@^2.0.0: pify "^3.0.0" safe-buffer "^5.1.1" -read-config-file@5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-5.0.1.tgz#ead3df0d9822cc96006ca16322eaa79dac8591c2" - integrity sha512-75zp4PDbvtBlECoZK1KEkNlesr9OWdMWL8oi4xq+HXAM+kKHKU+Cx2ksFt+ie2BkrmkLBOKSfONDuz+WIKWoXA== +read-config-file@5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-5.0.2.tgz#55e005e5a447a9ce5806358d7b22cb7cefb6436d" + integrity sha512-tVt1lsiSjs+FtL/vtfCivqtKR1UNk3BB3uPJQvJqkgtAYDvZjo0xyXFYSVmzaTcO+Jdi5G7O2K2vDV+p1M/oug== dependencies: dotenv "^8.2.0" dotenv-expand "^5.1.0" @@ -11015,7 +11027,7 @@ rimraf@2.6.3: dependencies: glob "^7.1.3" -rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.3, rimraf@^2.7.1: +rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.3, rimraf@^2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -11231,11 +11243,6 @@ semver@^5.4.1, semver@^5.5.1, semver@^5.6.0: resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -semver@^7.1.1: - version "7.1.2" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.1.2.tgz#847bae5bce68c5d08889824f02667199b70e3d87" - integrity sha512-BJs9T/H8sEVHbeigqzIEo57Iu/3DG6c4QoqTfbQB3BPA4zgzAomh/Fk9E7QtjWQ8mx2dgA9YCfSF4y9k9bHNpQ== - semver@^7.1.3: version "7.1.3" resolved "https://registry.yarnpkg.com/semver/-/semver-7.1.3.tgz#e4345ce73071c53f336445cfc19efb1c311df2a6" @@ -12025,7 +12032,7 @@ svg-parser@^2.0.0: resolved "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.4.tgz#fdc2e29e13951736140b76cb122c8ee6630eb6b5" integrity sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ== -svg2png@^4.1.1: +svg2png@4.1.1, svg2png@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/svg2png/-/svg2png-4.1.1.tgz#6b9e0398aa418778b6436e127a2fb7f00d499c28" integrity sha1-a54DmKpBh3i2Q24Sei+38A1JnCg= @@ -12084,10 +12091,10 @@ tapable@^1.0.0, tapable@^1.1.3: resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== -temp-file@^3.3.6: - version "3.3.6" - resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-3.3.6.tgz#bd7a1951338bf93b59380b498ec1804d5b76c449" - integrity sha512-7TPldi8QJqRlPIF/Y33mVvo8+xDfi6+aVTCK4CrCaLqCoaOnVtf3SA4hCU0T5nhYDdOC7erw7o2uWfvijlk4Ug== +temp-file@^3.3.7: + version "3.3.7" + resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-3.3.7.tgz#686885d635f872748e384e871855958470aeb18a" + integrity sha512-9tBJKt7GZAQt/Rg0QzVWA8Am8c1EFl+CAv04/aBVqlx5oyfQ508sFIABshQ0xbZu6mBrFLWIUXO/bbLYghW70g== dependencies: async-exit-hook "^2.0.1" fs-extra "^8.1.0" @@ -12547,14 +12554,14 @@ upath@^1.1.1: resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894" integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg== -update-notifier@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.0.0.tgz#f344a6f8b03e00e31b323d632a0e632e9f0e0654" - integrity sha512-p9zf71hWt5GVXM4iEBujpUgx8mK9AWiCCapEJm/O1z5ntCim83Z1ATqzZFBHFYqx03laMqv8LiDgs/7ikXjf/g== +update-notifier@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.0.tgz#4866b98c3bc5b5473c020b1250583628f9a328f3" + integrity sha512-w3doE1qtI0/ZmgeoDoARmI5fjDoT93IfKgEGqm26dGUOh8oNpaSTsGNdYRN/SjOuo10jcJGwkEL3mroKzktkew== dependencies: boxen "^4.2.0" chalk "^3.0.0" - configstore "^5.0.0" + configstore "^5.0.1" has-yarn "^2.1.0" import-lazy "^2.1.0" is-ci "^2.0.0" @@ -12562,6 +12569,7 @@ update-notifier@^4.0.0: is-npm "^4.0.0" is-yarn-global "^0.3.0" latest-version "^5.0.0" + pupa "^2.0.1" semver-diff "^3.1.1" xdg-basedir "^4.0.0"