Upgrade notarize and electron-builder

ooni · Nov 23, 2023 · 768a041 · 768a041
1 parent ef7ee7a
commit 768a041
Show file tree

Hide file tree

Showing 4 changed files with 3,174 additions and 2,916 deletions.
diff --git a/package.json b/package.json
@@ -152,6 +152,7 @@
     "@babel/cli": "7.6.0",
     "@babel/core": "7.6.0",
     "@babel/register": "7.6.0",
+    "@electron/notarize": "^2.1.0",
     "@next/bundle-analyzer": "^10.0.6",
     "@sentry/browser": "^5.12.1",
     "@sentry/cli": "^1.61.0",
@@ -174,8 +175,7 @@
     "debug": "^4.1.1",
     "dotenv": "^8.2.0",
     "electron": "12.0.11",
-    "electron-builder": "^22.7.0",
-    "electron-notarize": "0.1.1",
+    "electron-builder": "^24.6.4",
     "eslint": "^7.21.0",
     "eslint-plugin-jest": "^26.1.0",
     "eslint-plugin-react": "^7.22.0",

diff --git a/renderer/components/test-results/TestResultsContainer.js b/renderer/components/test-results/TestResultsContainer.js
@@ -170,7 +170,7 @@ const TestResultsContainer = ({results}) => {
 
   // We try to add rows which were reported as errors by probe-cli into
   // the results. Missing fields are handled in `ResultRow`
-  const fullRows = rows.concat(errors)
+  const fullRows = rows?.concat(errors)
 
   const byMonth = groupRowsByMonth(fullRows)
 

diff --git a/scripts/notarize.js b/scripts/notarize.js
@@ -1,6 +1,6 @@
 require('dotenv').config()
 const pkg = require('../package.json')
-const { notarize } = require('electron-notarize')
+const { notarize } = require('@electron/notarize')
 
 exports.default = async function notarizing(context) {
   const { electronPlatformName, appOutDir } = context
@@ -20,6 +20,6 @@ exports.default = async function notarizing(context) {
     appPath: `${appOutDir}/${appName}.app`,
     appleId: process.env.OONI_APPLEID,
     appleIdPassword: process.env.OONI_APPLEIDPASS,
-    ascProvider: process.env.OONI_TEAMID,
+    teamId: process.env.OONI_TEAMID,
   })
 }