diff --git a/package.json b/package.json index a3432f25a8..029402979d 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "cross-zip": "^4.0.0", "debug": "^4.3.1", "electron-osx-sign": "^0.5.0", - "electron-packager": "^15.0.0", + "electron-packager": "^15.4.0", "electron-rebuild": "^3.2.2", "express": "^4.17.1", "express-ws": "^5.0.2", @@ -154,9 +154,6 @@ "electron-winstaller": "^5.0.0", "electron-wix-msi": "^3.0.6" }, - "resolutions": { - "electron-packager/electron-notarize": "<1.1.0" - }, "lint-staged": { "*.ts": "eslint --ext .ts --fix" }, diff --git a/packages/api/core/package.json b/packages/api/core/package.json index b7c75edd01..a505851252 100644 --- a/packages/api/core/package.json +++ b/packages/api/core/package.json @@ -55,7 +55,7 @@ "@malept/cross-spawn-promise": "^2.0.0", "colors": "^1.4.0", "debug": "^4.3.1", - "electron-packager": "^15.0.0", + "electron-packager": "^15.4.0", "electron-rebuild": "^3.2.2", "fast-glob": "^3.2.7", "find-up": "^5.0.0", diff --git a/packages/utils/types/package.json b/packages/utils/types/package.json index 73fa986cda..a6e476629a 100644 --- a/packages/utils/types/package.json +++ b/packages/utils/types/package.json @@ -9,7 +9,7 @@ "typings": "index.d.ts", "dependencies": { "@electron-forge/async-ora": "6.0.0-beta.60", - "electron-packager": "^15.0.0", + "electron-packager": "^15.4.0", "electron-rebuild": "^3.2.2", "ora": "^5.0.0" }, diff --git a/tools/update-dependencies.js b/tools/update-dependencies.js index 99d1a968f9..778241057f 100755 --- a/tools/update-dependencies.js +++ b/tools/update-dependencies.js @@ -8,7 +8,6 @@ const DO_NOT_UPGRADE = [ '@types/node-fetch', // No longer needed when node-fetch is upgraded to >= 3.0.0 '@typescript-eslint/eslint-plugin', // special case 'commander', // TODO: convert to yargs - 'electron-notarize', // There's a bug in the TypeScript definition which affects Packager 'find-up', // Requires ESM 'log-symbols', // Requires ESM 'node-fetch', // Requires ESM diff --git a/yarn.lock b/yarn.lock index 1e3092f30f..404465ae19 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2959,6 +2959,18 @@ asar@^3.0.0, asar@^3.0.3: optionalDependencies: "@types/glob" "^7.1.1" +asar@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/asar/-/asar-3.1.0.tgz#70b0509449fe3daccc63beb4d3c7d2e24d3c6473" + integrity sha512-vyxPxP5arcAqN4F/ebHd/HhwnAiZtwhglvdmc7BR2f0ywbVNTOpSeyhLDbGXtE/y58hv1oC75TaNIXutnsOZsQ== + dependencies: + chromium-pickle-js "^0.2.0" + commander "^5.0.0" + glob "^7.1.6" + minimatch "^3.0.4" + optionalDependencies: + "@types/glob" "^7.1.1" + asn1@~0.2.3: version "0.2.4" resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" @@ -4400,10 +4412,10 @@ electron-installer-snap@^5.1.0: which "^2.0.1" yargs "^15.0.1" -electron-notarize@<1.1.0, electron-notarize@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-1.0.1.tgz#97e6ab57fdc32abc6dfa88d3edbb5037189a9fb1" - integrity sha512-5B0ToIuuqb+Uzq3Kvs7BReUh52WRELmy8dHWusQwXgksYm2RgzsFFGNhv9eAmzuzXNW4xPgUbdCmYrcVGSlXIg== +electron-notarize@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-1.1.1.tgz#3ed274b36158c1beb1dbef14e7faf5927e028629" + integrity sha512-kufsnqh86CTX89AYNG3NCPoboqnku/+32RxeJ2+7A4Rbm4bbOx0Nc7XTy3/gAlBfpj9xPAxHfhZLOHgfi6cJVw== dependencies: debug "^4.1.1" fs-extra "^9.0.1" @@ -4420,16 +4432,16 @@ electron-osx-sign@^0.5.0: minimist "^1.2.0" plist "^3.0.1" -electron-packager@^15.0.0: - version "15.3.0" - resolved "https://registry.yarnpkg.com/electron-packager/-/electron-packager-15.3.0.tgz#10f51960d518e4c35b760c10d1392c7ebea24c8b" - integrity sha512-PHcykXinmjPyJcYoNGbOWNsOU25nIbMLHBAfg4caazWzYELFL14FshDZEqqrvVOMEUnqjx/Ktc1NmMIN5ZRomQ== +electron-packager@^15.4.0: + version "15.4.0" + resolved "https://registry.yarnpkg.com/electron-packager/-/electron-packager-15.4.0.tgz#07ea036b70cde2062d4c8dce4d907d793b303998" + integrity sha512-JrrLcBP15KGrPj0cZ/ALKGmaQ4gJkn3mocf0E3bRKdR3kxKWYcDRpCvdhksYDXw/r3I6tMEcZ7XzyApWFXdVpw== dependencies: "@electron/get" "^1.6.0" - asar "^3.0.0" + asar "^3.1.0" cross-spawn-windows-exe "^1.2.0" debug "^4.0.1" - electron-notarize "^1.0.0" + electron-notarize "^1.1.1" electron-osx-sign "^0.5.0" extract-zip "^2.0.0" filenamify "^4.1.0"