From 8e8beca6abcc4e8e127e2be5f82739c1aa7465f9 Mon Sep 17 00:00:00 2001 From: Afonso Jorge Ramos Date: Wed, 6 Dec 2023 18:05:02 +0000 Subject: [PATCH 1/2] deps: switch and upgrade @electron/notarize --- package.json | 6 +++--- pnpm-lock.yaml | 27 +++++++++++++-------------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 66147467b..6c9f16010 100644 --- a/package.json +++ b/package.json @@ -112,6 +112,7 @@ "typescript": "5.2.2" }, "devDependencies": { + "@electron/notarize": "1.2.4", "@testing-library/react": "14.0.0", "@testing-library/react-hooks": "8.0.1", "@types/jest": "29.5.10", @@ -124,7 +125,7 @@ "css-loader": "6.8.1", "electron": "^13.1.7", "electron-builder": "24.6.4", - "electron-notarize": "1.2.2", + "husky": "8.0.3", "jest": "29.7.0", "jest-environment-jsdom": "29.7.0", "nock": "13.3.4", @@ -137,8 +138,7 @@ "ts-jest": "29.1.1", "webpack": "5.88.2", "webpack-cli": "5.1.4", - "webpack-merge": "5.9.0", - "husky": "8.0.3" + "webpack-merge": "5.9.0" }, "packageManager": "pnpm@8.9.0", "lint-staged": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d7b283ce5..ee2e32af1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -55,6 +55,9 @@ dependencies: version: 5.2.2 devDependencies: + '@electron/notarize': + specifier: 1.2.4 + version: 1.2.4 '@testing-library/react': specifier: 14.0.0 version: 14.0.0(react-dom@18.2.0)(react@18.2.0) @@ -91,9 +94,6 @@ devDependencies: electron-builder: specifier: 24.6.4 version: 24.6.4 - electron-notarize: - specifier: 1.2.2 - version: 1.2.2 husky: specifier: 8.0.3 version: 8.0.3 @@ -534,6 +534,16 @@ packages: transitivePeerDependencies: - supports-color + /@electron/notarize@1.2.4: + resolution: {integrity: sha512-W5GQhJEosFNafewnS28d3bpQ37/s91CDWqxVchHfmv2dQSTWpOzNlUVQwYzC1ay5bChRV/A9BTL68yj0Pa+TSg==} + engines: {node: '>= 10.0.0'} + dependencies: + debug: 4.3.4 + fs-extra: 9.1.0 + transitivePeerDependencies: + - supports-color + dev: true + /@electron/notarize@2.1.0: resolution: {integrity: sha512-Q02xem1D0sg4v437xHgmBLxI2iz/fc0D4K7fiVWHa/AnW8o7D751xyKNXgziA6HrTOme9ul1JfWN5ark8WH1xA==} engines: {node: '>= 10.0.0'} @@ -2339,17 +2349,6 @@ packages: - supports-color dev: true - /electron-notarize@1.2.2: - resolution: {integrity: sha512-ZStVWYcWI7g87/PgjPJSIIhwQXOaw4/XeXU+pWqMMktSLHaGMLHdyPPN7Cmao7+Cr7fYufA16npdtMndYciHNw==} - engines: {node: '>= 10.0.0'} - deprecated: Please use @electron/notarize moving forward. There is no API change, just a package name change - dependencies: - debug: 4.3.4 - fs-extra: 9.1.0 - transitivePeerDependencies: - - supports-color - dev: true - /electron-positioner@4.1.0: resolution: {integrity: sha512-726DfbI9ZNoCg+Fcu6XLuTKTnzf+6nFqv7h+K/V6Ug7IbaPMI7s9S8URnGtWFCy5N5PL4HSzRFF2mXuinftDdg==} dev: false From a4a89d6958cc2405ca3cd84bcf334b18ff5679cd Mon Sep 17 00:00:00 2001 From: Afonso Jorge Ramos Date: Fri, 8 Dec 2023 18:08:07 +0000 Subject: [PATCH 2/2] fix: notarize usage --- scripts/notarize.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/notarize.js b/scripts/notarize.js index 8532363ea..f30f84eea 100644 --- a/scripts/notarize.js +++ b/scripts/notarize.js @@ -1,4 +1,4 @@ -const { notarize } = require('electron-notarize'); +const { notarize } = require('@electron/notarize'); const packageJson = require('../package.json'); const appBundleId = packageJson.build.appId; @@ -11,7 +11,7 @@ const notarizeApp = async (context) => { if (!shouldNotarize || !isMacOS) { console.log( - ' • notarizing either should not notarize or not building for macOS' + ' • notarizing either should not notarize or not building for macOS', ); return; }