From 833e27e91d6258d6171d20d722a102fc916edd73 Mon Sep 17 00:00:00 2001 From: Michael Hillcox Date: Fri, 20 Dec 2024 11:07:28 +0000 Subject: [PATCH] chore: update notary lib and removed patch --- package.json | 6 ++--- patches/@electron__notarize@2.3.0.patch | 18 ------------- pnpm-lock.yaml | 36 +++++++------------------ 3 files changed, 13 insertions(+), 47 deletions(-) delete mode 100644 patches/@electron__notarize@2.3.0.patch diff --git a/package.json b/package.json index 95520f81..847229fa 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,8 @@ "class-validator": ">=0.14.0", "loader-utils": ">=1.4.1", "ejs": ">=3.1.7", - "deasync": ">=0.1.30" + "deasync": ">=0.1.30", + "@electron/notarize": "^2.5.0" }, "devDependencies": { "@electron/notarize": "^2.3.0", @@ -112,8 +113,7 @@ "pnpm": { "patchedDependencies": { "webpack@4.46.0": "patches/webpack@4.46.0.patch", - "terser-webpack-plugin@1.4.5": "patches/terser-webpack-plugin@1.4.5.patch", - "@electron/notarize@2.3.0": "patches/@electron__notarize@2.3.0.patch" + "terser-webpack-plugin@1.4.5": "patches/terser-webpack-plugin@1.4.5.patch" } } } diff --git a/patches/@electron__notarize@2.3.0.patch b/patches/@electron__notarize@2.3.0.patch deleted file mode 100644 index 63d4091e..00000000 --- a/patches/@electron__notarize@2.3.0.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/lib/notarytool.js b/lib/notarytool.js -index 76d3556e3b4ed304ef29a3166cb9554edf6b83b8..80de04bc012737dd8490865eb25c96f058105158 100644 ---- a/lib/notarytool.js -+++ b/lib/notarytool.js -@@ -110,7 +110,12 @@ function notarizeAndWaitForNotaryTool(opts) { - 'json', - ]; - const result = yield (0, spawn_1.spawn)('xcrun', notarizeArgs); -- const parsed = JSON.parse(result.output.trim()); -+ let parsed = null; -+ try { parsed = JSON.parse(result.output.trim()); } -+ catch (e) { -+ console.log('notarization result', result.output); -+ throw e; -+ } - if (result.code !== 0 || !parsed.status || parsed.status !== 'Accepted') { - try { - if (parsed && parsed.id) { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 89c34a09..59d2bb03 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11,11 +11,9 @@ overrides: loader-utils: '>=1.4.1' ejs: '>=3.1.7' deasync: '>=0.1.30' + '@electron/notarize': ^2.5.0 patchedDependencies: - '@electron/notarize@2.3.0': - hash: t6hd5acteo47umnzcrk6bcr6nq - path: patches/@electron__notarize@2.3.0.patch terser-webpack-plugin@1.4.5: hash: ra2x2visp7ftkcqwvqllfxzxzq path: patches/terser-webpack-plugin@1.4.5.patch @@ -80,8 +78,8 @@ importers: version: 0.0.4 devDependencies: '@electron/notarize': - specifier: ^2.3.0 - version: 2.3.0(patch_hash=t6hd5acteo47umnzcrk6bcr6nq) + specifier: ^2.5.0 + version: 2.5.0 '@fortawesome/fontawesome-svg-core': specifier: ^6.1.1 version: 6.3.0 @@ -889,12 +887,8 @@ packages: resolution: {integrity: sha512-BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw==} engines: {node: '>=8.6'} - '@electron/notarize@2.3.0': - resolution: {integrity: sha512-EiTBU0BwE7HZZjAG1fFWQaiQpCuPrVGn7jPss1kUjD6eTTdXXd29RiZqEqkgN7xqt/Pgn4g3I7Saqovanrfj3w==} - engines: {node: '>= 10.0.0'} - - '@electron/notarize@2.3.2': - resolution: {integrity: sha512-zfayxCe19euNwRycCty1C7lF7snk9YwfRpB5M8GLr1a4ICH63znxaPNAubrMvj0yDvVozqfgsdYpXVUnpWBDpg==} + '@electron/notarize@2.5.0': + resolution: {integrity: sha512-jNT8nwH1f9X5GEITXaQ8IF/KdskvIkOFfB2CvwumsveVidzpSc+mvhhTMdAGSYF3O+Nq49lJ7y+ssODRXu06+A==} engines: {node: '>= 10.0.0'} '@electron/osx-sign@1.3.1': @@ -8758,15 +8752,7 @@ snapshots: transitivePeerDependencies: - supports-color - '@electron/notarize@2.3.0(patch_hash=t6hd5acteo47umnzcrk6bcr6nq)': - dependencies: - debug: 4.3.4(supports-color@6.1.0) - fs-extra: 9.1.0 - promise-retry: 2.0.1 - transitivePeerDependencies: - - supports-color - - '@electron/notarize@2.3.2': + '@electron/notarize@2.5.0': dependencies: debug: 4.3.4(supports-color@6.1.0) fs-extra: 9.1.0 @@ -8945,7 +8931,7 @@ snapshots: '@jest/core@24.9.0(utf-8-validate@5.0.10)': dependencies: '@jest/console': 24.9.0 - '@jest/reporters': 24.9.0(utf-8-validate@5.0.10) + '@jest/reporters': 24.9.0 '@jest/test-result': 24.9.0 '@jest/transform': 24.9.0 '@jest/types': 24.9.0 @@ -9064,7 +9050,7 @@ snapshots: transitivePeerDependencies: - supports-color - '@jest/reporters@24.9.0(utf-8-validate@5.0.10)': + '@jest/reporters@24.9.0': dependencies: '@jest/environment': 24.9.0 '@jest/test-result': 24.9.0 @@ -9088,9 +9074,7 @@ snapshots: source-map: 0.6.1 string-length: 2.0.0 transitivePeerDependencies: - - bufferutil - supports-color - - utf-8-validate '@jest/reporters@29.5.0': dependencies: @@ -9298,7 +9282,7 @@ snapshots: '@overwolf/ow-app-builder-lib@25.0.6(dmg-builder@25.0.5)(electron-builder-squirrel-windows@25.0.5)': dependencies: '@develar/schema-utils': 2.6.5 - '@electron/notarize': 2.3.2 + '@electron/notarize': 2.5.0 '@electron/osx-sign': 1.3.1 '@electron/rebuild': 3.6.0 '@electron/universal': 2.0.1 @@ -10425,7 +10409,7 @@ snapshots: app-builder-lib@25.0.5(dmg-builder@25.0.5)(electron-builder-squirrel-windows@25.0.5): dependencies: '@develar/schema-utils': 2.6.5 - '@electron/notarize': 2.3.2 + '@electron/notarize': 2.5.0 '@electron/osx-sign': 1.3.1 '@electron/rebuild': 3.6.0 '@electron/universal': 2.0.1