From 94635dbd021dc89690f0bb6871ed1d7ff93df222 Mon Sep 17 00:00:00 2001
From: Hinton <hinton@users.noreply.github.com>
Date: Tue, 30 Jan 2024 17:45:59 +0100
Subject: [PATCH] Remove double signing and use the proper extraFiles for
 safari extension

---
 apps/desktop/electron-builder.json |  9 +++++++-
 apps/desktop/scripts/after-sign.js | 35 ------------------------------
 2 files changed, 8 insertions(+), 36 deletions(-)

diff --git a/apps/desktop/electron-builder.json b/apps/desktop/electron-builder.json
index b9019311f5a..4fad7ee2bf2 100644
--- a/apps/desktop/electron-builder.json
+++ b/apps/desktop/electron-builder.json
@@ -124,7 +124,14 @@
     "extendInfo": {
       "LSMinimumSystemVersion": "10.15.0",
       "ElectronTeamID": "LTZ2PFU5D6"
-    }
+    },
+    "extraFiles": [
+      {
+        "from": "PlugIns/safari.appex",
+        "to": "PlugIns/safari.appex"
+      }
+    ],
+    "x64ArchFiles": "Contents/PlugIns/safari.appex/**/*"
   },
   "nsisWeb": {
     "oneClick": false,
diff --git a/apps/desktop/scripts/after-sign.js b/apps/desktop/scripts/after-sign.js
index 97815bc8b9b..73c8f44529d 100644
--- a/apps/desktop/scripts/after-sign.js
+++ b/apps/desktop/scripts/after-sign.js
@@ -1,10 +1,7 @@
 /* eslint-disable @typescript-eslint/no-var-requires, no-console */
 require("dotenv").config();
-const path = require("path");
 
 const { notarize } = require("@electron/notarize");
-const { deepAssign } = require("builder-util");
-const fse = require("fs-extra");
 
 exports.default = run;
 
@@ -15,38 +12,6 @@ async function run(context) {
   const appName = context.packager.appInfo.productFilename;
   const appPath = `${context.appOutDir}/${appName}.app`;
   const macBuild = context.electronPlatformName === "darwin";
-  const copyPlugIn = ["darwin", "mas"].includes(context.electronPlatformName);
-
-  if (copyPlugIn) {
-    // Copy Safari plugin to work-around https://github.com/electron-userland/electron-builder/issues/5552
-    const plugIn = path.join(__dirname, "../PlugIns");
-    if (fse.existsSync(plugIn)) {
-      fse.mkdirSync(path.join(appPath, "Contents/PlugIns"));
-      fse.copySync(
-        path.join(plugIn, "safari.appex"),
-        path.join(appPath, "Contents/PlugIns/safari.appex"),
-      );
-
-      // Resign to sign safari extension
-      if (context.electronPlatformName === "mas") {
-        const masBuildOptions = deepAssign(
-          {},
-          context.packager.platformSpecificBuildOptions,
-          context.packager.config.mas,
-        );
-        if (context.targets.some((e) => e.name === "mas-dev")) {
-          deepAssign(masBuildOptions, {
-            type: "development",
-          });
-        }
-        if (context.packager.packagerOptions.prepackaged == null) {
-          await context.packager.sign(appPath, context.appOutDir, masBuildOptions, context.arch);
-        }
-      } else {
-        await context.packager.signApp(context, true);
-      }
-    }
-  }
 
   if (macBuild) {
     console.log("### Notarizing " + appPath);