Upgrade notarize

package.json

@@ -125,6 +125,13 @@
       }
     },
     "mac": {
+      "target": {
+        "target": "default",
+        "arch": [
+          "x64",
+          "arm64"
+        ]
+      },
       "hardenedRuntime": true,
       "gatekeeperAssess": false,
       "entitlements": "./build/entitlements.mac.inherit.plist",
@@ -152,6 +159,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",
@@ -175,7 +183,6 @@
     "dotenv": "^8.2.0",
     "electron": "12.0.11",
     "electron-builder": "^22.7.0",
-    "electron-notarize": "0.1.1",
     "eslint": "^7.21.0",
     "eslint-plugin-jest": "^26.1.0",
     "eslint-plugin-react": "^7.22.0",

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)
 

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,
   })
 }