From e5afbaf9ae74eaae540fb88a85e5820d78394e8b Mon Sep 17 00:00:00 2001
From: Tobie Morgan Hitchcock <tobie@surrealdb.com>
Date: Thu, 9 May 2024 14:40:59 -0400
Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20use=20`electron-notarize-dmg`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                       | 45 -------------------------
 packages/electron/lib/commands/build.js |  5 ++-
 packages/electron/package.json          |  3 +-
 3 files changed, 3 insertions(+), 50 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 844dd7c8..c8f1ee4e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15444,28 +15444,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/electron-notarize-dmg": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/electron-notarize-dmg/-/electron-notarize-dmg-1.0.0.tgz",
-      "integrity": "sha512-/NGmml9iB2FnBY9PiLfmJ13qqppc/s3VvVjib/bwQRaUl9bEOVNlJ3DhaQG9TxahzvF4DSLI7lOASlD8FIEDbQ==",
-      "dependencies": {
-        "debug": "^4.1.1",
-        "fs-extra": "^8.1.0"
-      }
-    },
-    "node_modules/electron-notarize-dmg/node_modules/fs-extra": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=6 <7 || >=8"
-      }
-    },
     "node_modules/electron-publish": {
       "version": "24.13.1",
       "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-24.13.1.tgz",
@@ -40161,7 +40139,6 @@
         "builder-util": "^24.8.1",
         "electron": "30.0.3",
         "electron-builder": "^24.13.3",
-        "electron-notarize-dmg": "^1.0.0",
         "electron-updater": "^6.1.8",
         "ember-cli-babel": "^8.2.0",
         "ember-cli-htmlbars": "^6.3.0"
@@ -42318,7 +42295,6 @@
         "builder-util": "^24.8.1",
         "electron": "30.0.3",
         "electron-builder": "^24.13.3",
-        "electron-notarize-dmg": "^1.0.0",
         "electron-updater": "^6.1.8",
         "ember-cli-babel": "^8.2.0",
         "ember-cli-htmlbars": "^6.3.0"
@@ -55838,27 +55814,6 @@
         }
       }
     },
-    "electron-notarize-dmg": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/electron-notarize-dmg/-/electron-notarize-dmg-1.0.0.tgz",
-      "integrity": "sha512-/NGmml9iB2FnBY9PiLfmJ13qqppc/s3VvVjib/bwQRaUl9bEOVNlJ3DhaQG9TxahzvF4DSLI7lOASlD8FIEDbQ==",
-      "requires": {
-        "debug": "^4.1.1",
-        "fs-extra": "^8.1.0"
-      },
-      "dependencies": {
-        "fs-extra": {
-          "version": "8.1.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-          "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
-          "requires": {
-            "graceful-fs": "^4.2.0",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
-          }
-        }
-      }
-    },
     "electron-publish": {
       "version": "24.13.1",
       "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-24.13.1.tgz",
diff --git a/packages/electron/lib/commands/build.js b/packages/electron/lib/commands/build.js
index 0d1a4cab..5daeafa4 100644
--- a/packages/electron/lib/commands/build.js
+++ b/packages/electron/lib/commands/build.js
@@ -4,7 +4,6 @@ const fs = require('fs');
 const path = require('path');
 const Builder = require('electron-builder');
 const Notarizer = require('@electron/notarize');
-const Dmgerizer = require('electron-notarize-dmg');
 const Command = require('ember-cli/lib/commands/build');
 const { log } = require('builder-util');
 
@@ -181,10 +180,10 @@ module.exports = Command.extend({
 
 									log.info({ appId, dmgPath }, "notarizing");
 
-									return await Dmgerizer.notarize({
+									return await Notarizer.notarize({
 										tool: 'notarytool',
 										appBundleId: appId,
-										dmgPath: dmgPath,
+										appPath: dmgPath,
 										appleId: APPLE_ID,
 										teamId: APPLE_TEAMID,
 										appleIdPassword: APPLE_PASSWORD,
diff --git a/packages/electron/package.json b/packages/electron/package.json
index 26382471..197c785b 100644
--- a/packages/electron/package.json
+++ b/packages/electron/package.json
@@ -21,7 +21,6 @@
     "builder-util": "^24.8.1",
     "electron": "30.0.3",
     "electron-builder": "^24.13.3",
-    "electron-notarize-dmg": "^1.0.0",
     "electron-updater": "^6.1.8",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-htmlbars": "^6.3.0"
@@ -34,4 +33,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}
\ No newline at end of file