diff --git a/build/background.tiff b/build/background.tiff
new file mode 100644
index 00000000..78dc7e93
Binary files /dev/null and b/build/background.tiff differ
diff --git a/ci/notarize.js b/ci/notarize.js
index 6cbb3b36..cc925a25 100644
--- a/ci/notarize.js
+++ b/ci/notarize.js
@@ -15,6 +15,10 @@ exports.default = async function notarizing(context) {
if (electronPlatformName !== "darwin") {
return
}
+ if (process.env.CSC_IDENTITY_AUTO_DISCOVERY === "false") {
+ console.log("CSC_IDENTITY_AUTO_DISCOVERY is set to false, skipping notarization")
+ return
+ }
const appName = context.packager.appInfo.productFilename
diff --git a/package.json b/package.json
index f881e654..b8d9b58d 100644
--- a/package.json
+++ b/package.json
@@ -11,12 +11,12 @@
},
"license": "MIT",
"scripts": {
- "postinstall": "shx rm -rf static/bin && shx cp -r node_modules/@mysteriumnetwork/node/bin static/bin",
"dev": "electron-webpack dev",
"lint": "eslint src",
"clean": "shx rm -rf dist",
"build": "electron-webpack",
- "bundle": "yarn build && electron-builder"
+ "bundle": "yarn build && electron-builder",
+ "bundle-dev": "yarn build && CSC_IDENTITY_AUTO_DISCOVERY=false electron-builder"
},
"engines": {
"node": ">=16"
@@ -26,7 +26,7 @@
"@fortawesome/free-brands-svg-icons": "^5.15.3",
"@fortawesome/free-solid-svg-icons": "^5.15.3",
"@fortawesome/react-fontawesome": "^0.1.14",
- "@mysteriumnetwork/node": "1.9.3",
+ "@mysteriumnetwork/node": "1.9.5-p3",
"@mysteriumnetwork/terms": "0.0.41",
"@sentry/electron": "^3.0.7",
"@use-it/interval": "^1.0.0",
@@ -84,8 +84,8 @@
"@types/webpack-env": "^1.16.3",
"@typescript-eslint/eslint-plugin": "^5.23.0",
"@typescript-eslint/parser": "^5.23.0",
- "electron": "^19.0.5",
- "electron-builder": "^23.0.3",
+ "electron": "^19.0.8",
+ "electron-builder": "^23.1.0",
"electron-devtools-installer": "^3.2.0",
"electron-download": "^4.1.1",
"electron-notarize": "^1.2.1",
@@ -124,15 +124,25 @@
"buildResources": "build",
"output": "dist"
},
+ "files": [
+ "!**/node_modules/@mysteriumnetwork/node/bin/**",
+ "**/node_modules/@mysteriumnetwork/node/bin/${platform}/${arch}/**"
+ ],
"mac": {
- "target": [
- "dmg",
- "zip"
- ],
+ "target": {
+ "target": "default",
+ "arch": "universal"
+ },
+ "singleArchFiles": "**/node_modules/@mysteriumnetwork/node/bin/**",
"icon": "static/logo.icns",
"hardenedRuntime": true,
"entitlements": "build/entitlements.mac.plist",
- "entitlementsInherit": "build/entitlements.mac.plist"
+ "entitlementsInherit": "build/entitlements.mac.plist",
+ "category": "public.app-category.productivity"
+ },
+ "dmg": {
+ "background": "build/background.tiff",
+ "iconTextSize": 14
},
"win": {
"target": [
diff --git a/src/main/node/mysteriumNode.ts b/src/main/node/mysteriumNode.ts
index 35ef8fb0..aaafd628 100644
--- a/src/main/node/mysteriumNode.ts
+++ b/src/main/node/mysteriumNode.ts
@@ -4,27 +4,22 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
-import { platform } from "os"
import { ChildProcess } from "child_process"
import { NodeHealthcheck, TequilapiClientFactory } from "mysterium-vpn-js"
import { BrowserWindow, dialog, ipcMain, IpcMainInvokeEvent } from "electron"
+import { mysteriumNodeBin } from "@mysteriumnetwork/node"
import { spawnProcess } from "../../utils/spawn"
import { log, logErrorMessage } from "../../shared/log/log"
import { TEQUILAPI_PORT } from "../../app/tequilapi"
-import { staticAssetPath } from "../../utils/paths"
import { IpcResponse, MainIpcListenChannels } from "../../shared/ipc"
import { isProduction } from "../../utils/env"
import { ExportIdentityOpts, ImportIdentityOpts } from "../../shared/node/mysteriumNodeIPC"
import { parseError } from "../../shared/errors/parseError"
const mystBin = (): string => {
- let mystBinaryName = "bin/myst"
- if (platform() === "win32") {
- mystBinaryName += ".exe"
- }
- return staticAssetPath(mystBinaryName)
+ return mysteriumNodeBin(process.platform, process.arch).replace("app.asar", "app.asar.unpacked")
}
const parseCLIError = (message: string): string => {
diff --git a/src/main/node/supervisor.ts b/src/main/node/supervisor.ts
index 95bff879..4d4a6b19 100644
--- a/src/main/node/supervisor.ts
+++ b/src/main/node/supervisor.ts
@@ -10,9 +10,8 @@ import { platform } from "os"
import semver from "semver"
import { ipcMain } from "electron"
+import { mysteriumSupervisorBin, nodeVersion } from "@mysteriumnetwork/node"
-import * as packageJson from "../../../package.json"
-import { staticAssetPath } from "../../utils/paths"
import { log } from "../../shared/log/log"
import { sudoExec } from "../../utils/sudo"
import { uid } from "../../utils/user"
@@ -28,11 +27,7 @@ function mystSockPath(): string {
}
const supervisorBin = (): string => {
- let supervisorBinaryName = "bin/myst_supervisor"
- if (isWin) {
- supervisorBinaryName += ".exe"
- }
- return staticAssetPath(supervisorBinaryName)
+ return mysteriumSupervisorBin(process.platform, process.arch).replace("app.asar", "app.asar.unpacked")
}
export class Supervisor {
@@ -99,7 +94,7 @@ export class Supervisor {
}
async upgrade(): Promise<void> {
- const bundledVersion = packageJson.dependencies["@mysteriumnetwork/node"]
+ const bundledVersion = nodeVersion()
let runningVersion = ""
try {
diff --git a/yarn.lock b/yarn.lock
index b35df423..69f925a3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -919,10 +919,10 @@
global-agent "^3.0.0"
global-tunnel-ng "^2.7.1"
-"@electron/universal@1.2.0":
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.2.0.tgz#518cac72bccd79c00bf41345119e6fdbabdb871d"
- integrity sha512-eu20BwNsrMPKoe2bZ3/l9c78LclDvxg3PlVXrQf3L50NaUuW5M59gbPytI+V4z7/QMrohUHetQaU0ou+p1UG9Q==
+"@electron/universal@1.2.1":
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.2.1.tgz#3c2c4ff37063a4e9ab1e6ff57db0bc619bc82339"
+ integrity sha512-7323HyMh7KBAl/nPDppdLsC87G6RwRU02dy5FPeGB1eS7rUePh55+WNWiDPLhFQqqVPHzh77M69uhmoT8XnwMQ==
dependencies:
"@malept/cross-spawn-promise" "^1.1.0"
asar "^3.1.0"
@@ -1033,13 +1033,15 @@
lodash "^4.17.15"
tmp-promise "^3.0.2"
-"@mysteriumnetwork/node@1.9.3":
- version "1.9.3"
- resolved "https://registry.yarnpkg.com/@mysteriumnetwork/node/-/node-1.9.3.tgz#1f86ab318bd05ba6e40fe79b51709b9db28a87fb"
- integrity sha512-E4LKnP1WtRKahCHJX4DC8MX0pq+H4ufqinKcJVbVeBu2va9TF+6pcGjEw+/8MWeCM7zJCTkxzqJbOvvGEPV9jg==
+"@mysteriumnetwork/node@1.9.5-p3":
+ version "1.9.5-p3"
+ resolved "https://registry.yarnpkg.com/@mysteriumnetwork/node/-/node-1.9.5-p3.tgz#679677d68933f6a966da040365f49ba125d1b8d2"
+ integrity sha512-VJwxA1Btukjz1hEHyMbmChoYZoFOGjvQ/cGpvxOmEoRMfvV4txBBlQiVZ5UYhyE4TC+euRf41kJhMg1FDRHsHw==
dependencies:
extract-zip "^2.0.0"
- follow-redirects "^1.5.2"
+ node-fetch "^2.6.7"
+ progress "^2.0.3"
+ semver "^7.3.7"
targz "^1.0.1"
"@mysteriumnetwork/terms@0.0.41":
@@ -1836,35 +1838,36 @@ app-builder-bin@4.0.0:
resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz#1df8e654bd1395e4a319d82545c98667d7eed2f0"
integrity sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA==
-app-builder-lib@23.0.3:
- version "23.0.3"
- resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.0.3.tgz#44c90237abdc4ad9b34a24658bee022828ad6205"
- integrity sha512-1qrtXYHXJfXhzJnMtVGjIva3067F1qYQubl2oBjI61gCBoCHvhghdYJ57XxXTQQ0VxnUhg1/Iaez87uXp8mD8w==
+app-builder-lib@23.1.0:
+ version "23.1.0"
+ resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.1.0.tgz#39bab8eb445d06ad9168eb2513c7f267923df2ba"
+ integrity sha512-aZpKjBBLzyxtr4Cmbyi3dl8uRO8SI2PG2MYEKYRZL6pl7IsKP2hJkCYzlD6NjLJlRIAZcFPFjFbJliO74DFf7w==
dependencies:
"7zip-bin" "~5.1.1"
"@develar/schema-utils" "~2.6.5"
- "@electron/universal" "1.2.0"
+ "@electron/universal" "1.2.1"
"@malept/flatpak-bundler" "^0.4.0"
async-exit-hook "^2.0.1"
bluebird-lst "^1.0.9"
- builder-util "23.0.2"
- builder-util-runtime "9.0.0"
+ builder-util "23.0.9"
+ builder-util-runtime "9.0.2"
chromium-pickle-js "^0.2.0"
- debug "^4.3.2"
- ejs "^3.1.6"
+ debug "^4.3.4"
+ ejs "^3.1.7"
electron-osx-sign "^0.6.0"
- electron-publish "23.0.2"
+ electron-publish "23.0.9"
form-data "^4.0.0"
- fs-extra "^10.0.0"
- hosted-git-info "^4.0.2"
+ fs-extra "^10.1.0"
+ hosted-git-info "^4.1.0"
is-ci "^3.0.0"
- isbinaryfile "^4.0.8"
+ isbinaryfile "^4.0.10"
js-yaml "^4.1.0"
lazy-val "^1.0.5"
- minimatch "^3.0.4"
+ minimatch "^3.1.2"
read-config-file "6.2.0"
sanitize-filename "^1.6.3"
- semver "^7.3.5"
+ semver "^7.3.7"
+ tar "^6.1.11"
temp-file "^3.4.0"
"aproba@^1.0.3 || ^2.0.0":
@@ -2035,6 +2038,11 @@ assign-symbols@^1.0.0:
resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
+astral-regex@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
+ integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
+
async-each@^1.0.1:
version "1.0.3"
resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
@@ -2466,20 +2474,28 @@ builder-util-runtime@9.0.0:
debug "^4.3.2"
sax "^1.2.4"
-builder-util@23.0.2:
- version "23.0.2"
- resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-23.0.2.tgz#da84a971076397e3a671726f4bb96f0c2214fea7"
- integrity sha512-HaNHL3axNW/Ms8O1mDx3I07G+ZnZ/TKSWWvorOAPau128cdt9S+lNx5ocbx8deSaHHX4WFXSZVHh3mxlaKJNgg==
+builder-util-runtime@9.0.2:
+ version "9.0.2"
+ resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.0.2.tgz#dc54f8581bbcf1e0428da4483fa46d09524be857"
+ integrity sha512-xF55W/8mgfT6+sMbX0TeiJkTusA5GMOzckM4rajN4KirFcUIuLTH8oEaTYmM86YwVCZaTwa/7GyFhauXaEICwA==
+ dependencies:
+ debug "^4.3.4"
+ sax "^1.2.4"
+
+builder-util@23.0.9:
+ version "23.0.9"
+ resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-23.0.9.tgz#8b1aeeeee679060e39ad2bd0f50f5b3f3cb53a59"
+ integrity sha512-ccPFwI1Sex4yLt8R3LI+H07p2jHICKwEWtxkFkb6jiU/g/VJnF1wazW7I1oMcCFcPTEl30GhqoRv9rfDD9VAiQ==
dependencies:
"7zip-bin" "~5.1.1"
"@types/debug" "^4.1.6"
"@types/fs-extra" "^9.0.11"
app-builder-bin "4.0.0"
bluebird-lst "^1.0.9"
- builder-util-runtime "9.0.0"
+ builder-util-runtime "9.0.2"
chalk "^4.1.1"
cross-spawn "^7.0.3"
- debug "^4.3.2"
+ debug "^4.3.4"
fs-extra "^10.0.0"
http-proxy-agent "^5.0.0"
https-proxy-agent "^5.0.0"
@@ -2733,6 +2749,11 @@ chownr@^1.0.1, chownr@^1.1.1, chownr@^1.1.2:
resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
+chownr@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
+ integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
+
chrome-trace-event@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4"
@@ -2790,13 +2811,13 @@ cli-boxes@^2.2.1:
resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f"
integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==
-cli-truncate@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-1.1.0.tgz#2b2dfd83c53cfd3572b87fc4d430a808afb04086"
- integrity sha512-bAtZo0u82gCfaAGfSNxUdTI9mNyza7D8w4CVCcaOsy7sgwDzvx6ekr6cuWJqY3UGzgnQ1+4wgENup5eIhgxEYA==
+cli-truncate@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7"
+ integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==
dependencies:
- slice-ansi "^1.0.0"
- string-width "^2.0.0"
+ slice-ansi "^3.0.0"
+ string-width "^4.2.0"
cliui@^4.0.0:
version "4.1.0"
@@ -3340,6 +3361,13 @@ debug@^4.3.2:
dependencies:
ms "2.1.2"
+debug@^4.3.4:
+ version "4.3.4"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+ integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+ dependencies:
+ ms "2.1.2"
+
decamelize@^1.1.2, decamelize@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
@@ -3503,32 +3531,31 @@ dir-glob@^3.0.1:
dependencies:
path-type "^4.0.0"
-dmg-builder@23.0.3:
- version "23.0.3"
- resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.0.3.tgz#ea94bc76fcd94612641580f3c6ae42c3f07f3fee"
- integrity sha512-mBYrHHnSM5PC656TDE+xTGmXIuWHAGmmRfyM+dV0kP+AxtwPof4pAXNQ8COd0/exZQ4dqf72FiPS3B9G9aB5IA==
+dmg-builder@23.1.0:
+ version "23.1.0"
+ resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.1.0.tgz#94426db22b762e7ffc61f0da1f68d385059a20ed"
+ integrity sha512-CzhPk/k12nJ2KqTbePkIwHOLiaWneQu2cgXCT9Hb5FhwI1vxTPalLsg8OZ57wKCrkL8AEftqqSff8gB5yWY/xw==
dependencies:
- app-builder-lib "23.0.3"
- builder-util "23.0.2"
- builder-util-runtime "9.0.0"
+ app-builder-lib "23.1.0"
+ builder-util "23.0.9"
+ builder-util-runtime "9.0.2"
fs-extra "^10.0.0"
iconv-lite "^0.6.2"
js-yaml "^4.1.0"
optionalDependencies:
- dmg-license "^1.0.9"
+ dmg-license "^1.0.11"
-dmg-license@^1.0.9:
- version "1.0.9"
- resolved "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.9.tgz#a2fb8d692af0e30b0730b5afc91ed9edc2d9cb4f"
- integrity sha512-Rq6qMDaDou2+aPN2SYy0x7LDznoJ/XaG6oDcH5wXUp+WRWQMUYE6eM+F+nex+/LSXOp1uw4HLFoed0YbfU8R/Q==
+dmg-license@^1.0.11:
+ version "1.0.11"
+ resolved "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.11.tgz#7b3bc3745d1b52be7506b4ee80cb61df6e4cd79a"
+ integrity sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q==
dependencies:
"@types/plist" "^3.0.1"
"@types/verror" "^1.10.3"
ajv "^6.10.0"
- cli-truncate "^1.1.0"
crc "^3.8.0"
- iconv-corefoundation "^1.1.6"
- plist "^3.0.1"
+ iconv-corefoundation "^1.1.7"
+ plist "^3.0.4"
smart-buffer "^4.0.2"
verror "^1.10.0"
@@ -3701,24 +3728,24 @@ ee-first@1.1.1:
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
-ejs@^3.1.6:
+ejs@^3.1.7:
version "3.1.8"
resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz#758d32910c78047585c7ef1f92f9ee041c1c190b"
integrity sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==
dependencies:
jake "^10.8.5"
-electron-builder@^23.0.3:
- version "23.0.3"
- resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.0.3.tgz#16264a0d8e3d40da1467bcc8ef7917538b54a3bc"
- integrity sha512-0lnTsljAgcOMuIiOjPcoFf+WxOOe/O04hZPgIvvUBXIbz3kolbNu0Xdch1f5WuQ40NdeZI7oqs8Eo395PcuGHQ==
+electron-builder@^23.1.0:
+ version "23.1.0"
+ resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.1.0.tgz#fdd213387008e44ab7dcabe53b84dbd969c1a7cc"
+ integrity sha512-UEblaQY8N9m8/HriOwl7jgFJ4olpWDXwdDBqwUkQiRHVNRnCfrA0u8LV03li5ZYhma6zFWzfIZbHd+uk8y//lQ==
dependencies:
"@types/yargs" "^17.0.1"
- app-builder-lib "23.0.3"
- builder-util "23.0.2"
- builder-util-runtime "9.0.0"
+ app-builder-lib "23.1.0"
+ builder-util "23.0.9"
+ builder-util-runtime "9.0.2"
chalk "^4.1.1"
- dmg-builder "23.0.3"
+ dmg-builder "23.1.0"
fs-extra "^10.0.0"
is-ci "^3.0.0"
lazy-val "^1.0.5"
@@ -3786,14 +3813,14 @@ electron-osx-sign@^0.6.0:
minimist "^1.2.0"
plist "^3.0.1"
-electron-publish@23.0.2:
- version "23.0.2"
- resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.0.2.tgz#aa11419ae57b847df4beb63b95e2b2a43161957c"
- integrity sha512-8gMYgWqv96lc83FCm85wd+tEyxNTJQK7WKyPkNkO8GxModZqt1GO8S+/vAnFGxilS/7vsrVRXFfqiCDUCSuxEg==
+electron-publish@23.0.9:
+ version "23.0.9"
+ resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.0.9.tgz#5b098dafab5d830b7c8bcd18b5a499164c51fa6b"
+ integrity sha512-afr2z6L07/elgDX+6I/G/0vzXOP6xYUd/aXx9tnTPSVZ/3AuvCegHrKiuh8sKYHmzoAcNGXe3ikISYIu961IfA==
dependencies:
"@types/fs-extra" "^9.0.11"
- builder-util "23.0.2"
- builder-util-runtime "9.0.0"
+ builder-util "23.0.9"
+ builder-util-runtime "9.0.2"
chalk "^4.1.1"
fs-extra "^10.0.0"
lazy-val "^1.0.5"
@@ -3880,10 +3907,10 @@ electron-webpack@^2.8.2:
webpack-merge "^4.2.2"
yargs "^15.3.1"
-electron@^19.0.5:
- version "19.0.5"
- resolved "https://registry.yarnpkg.com/electron/-/electron-19.0.5.tgz#852042c3f598cf2b3874cbcccc0308002c2b3fe9"
- integrity sha512-gC4kPr/Mf7QbeE5NAo1AC4Zg/SXLnW0ttlyzhVdyB2aErBspWh231UhHLJUlOdaVNqitdbnppdaXjoZHsR5QzQ==
+electron@^19.0.8:
+ version "19.0.8"
+ resolved "https://registry.yarnpkg.com/electron/-/electron-19.0.8.tgz#c4d4ba915de554f2926261eb37d3527d2b092d4c"
+ integrity sha512-OWK3P/NbDFfBUv+wbYv1/OV4jehY5DQPT7n1maQJfN9hsnrWTMktXS/bmS05eSUAjNAzHmKPKfiKH2c1Yr7nGw==
dependencies:
"@electron/get" "^1.14.1"
"@types/node" "^16.11.26"
@@ -4777,7 +4804,7 @@ flush-write-stream@^1.0.0:
inherits "^2.0.3"
readable-stream "^2.3.6"
-follow-redirects@^1.0.0, follow-redirects@^1.14.8, follow-redirects@^1.5.2:
+follow-redirects@^1.0.0, follow-redirects@^1.14.8:
version "1.14.9"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7"
integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==
@@ -4862,6 +4889,15 @@ fs-extra@^10.0.0:
jsonfile "^6.0.1"
universalify "^2.0.0"
+fs-extra@^10.1.0:
+ version "10.1.0"
+ resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
+ integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
+ dependencies:
+ graceful-fs "^4.2.0"
+ jsonfile "^6.0.1"
+ universalify "^2.0.0"
+
fs-extra@^4.0.1:
version "4.0.3"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
@@ -5375,10 +5411,10 @@ hosted-git-info@^2.1.4:
resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
-hosted-git-info@^4.0.2:
- version "4.0.2"
- resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz#5e425507eede4fea846b7262f0838456c4209961"
- integrity sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==
+hosted-git-info@^4.1.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224"
+ integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==
dependencies:
lru-cache "^6.0.0"
@@ -5555,12 +5591,12 @@ https-proxy-agent@^5.0.0:
agent-base "6"
debug "4"
-iconv-corefoundation@^1.1.6:
- version "1.1.6"
- resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.6.tgz#27c135470237f6f8d13462fa1f5eaf250523c29a"
- integrity sha512-1NBe55C75bKGZaY9UHxvXG3G0gEp0ziht7quhuFrW3SPgZDw9HI6qvYXRSV5M/Eupyu8ljuJ6Cba+ec15PZ4Xw==
+iconv-corefoundation@^1.1.7:
+ version "1.1.7"
+ resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz#31065e6ab2c9272154c8b0821151e2c88f1b002a"
+ integrity sha512-T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ==
dependencies:
- cli-truncate "^1.1.0"
+ cli-truncate "^2.1.0"
node-addon-api "^1.6.3"
iconv-lite@0.4.24:
@@ -6216,10 +6252,10 @@ isbinaryfile@^3.0.2:
dependencies:
buffer-alloc "^1.2.0"
-isbinaryfile@^4.0.8:
- version "4.0.8"
- resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.8.tgz#5d34b94865bd4946633ecc78a026fc76c5b11fcf"
- integrity sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w==
+isbinaryfile@^4.0.10:
+ version "4.0.10"
+ resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz#0c5b5e30c2557a2f06febd37b7322946aaee42b3"
+ integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==
isexe@^2.0.0:
version "2.0.0"
@@ -7006,6 +7042,14 @@ minipass@^3.0.0, minipass@^3.1.1:
dependencies:
yallist "^4.0.0"
+minizlib@^2.1.1:
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
+ integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
+ dependencies:
+ minipass "^3.0.0"
+ yallist "^4.0.0"
+
mississippi@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
@@ -7051,7 +7095,7 @@ mkdirp@^0.5.4:
dependencies:
minimist "^1.2.5"
-mkdirp@^1.0.4:
+mkdirp@^1.0.3, mkdirp@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
@@ -9189,12 +9233,14 @@ slash@^3.0.0:
resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
-slice-ansi@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d"
- integrity sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==
+slice-ansi@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787"
+ integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==
dependencies:
- is-fullwidth-code-point "^2.0.0"
+ ansi-styles "^4.0.0"
+ astral-regex "^2.0.0"
+ is-fullwidth-code-point "^3.0.0"
smart-buffer@^4.0.2:
version "4.1.0"
@@ -9791,6 +9837,18 @@ tar-stream@^1.1.2:
to-buffer "^1.1.1"
xtend "^4.0.0"
+tar@^6.1.11:
+ version "6.1.11"
+ resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
+ integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
+ dependencies:
+ chownr "^2.0.0"
+ fs-minipass "^2.0.0"
+ minipass "^3.0.0"
+ minizlib "^2.1.1"
+ mkdirp "^1.0.3"
+ yallist "^4.0.0"
+
targz@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/targz/-/targz-1.0.1.tgz#8f76a523694cdedfbb5d60a4076ff6eeecc5398f"