manual merge from reset-electron-forge-config

ui/desktop/electron-app/config/forge.config.js

@@ -5,18 +5,9 @@ const formattedCLIVersion = version().formatted;
 
 module.exports = {
   hooks: {
-    preMake: (forgeConfig) => {
-      if (process.env.BOUNDARY_DESKTOP_SIGNING_IDENTITY) {
-        forgeConfig.osxSign = {
-          identity: process.env.BOUNDARY_DESKTOP_SIGNING_IDENTITY,
-          hardenedRuntime: true,
-          "gatekeeper-assess": false,
-          entitlements: "config/macos/entitlements.plist",
-          "entitlements-inherit": "config/macos/entitlements.plist",
-          "signature-flags": "library"
-        }
-      } else {
-        console.warn('WARNING: Could not find signing identity. Skipping signing.');
+    prePackage: () => {
+      if (!process.env.BOUNDARY_DESKTOP_SIGNING_IDENTITY) {
+        console.warn('\nWARNING: Could not find signing identity.');
       }
     }
   },
@@ -29,7 +20,14 @@ module.exports = {
     appBundleId: "com.electron.boundary",
     // TODO: where should the client version number come from?
     appVersion: `1.0.0 ${formattedCLIVersion}`,
-    appCopyright: "Copyright © 2021 HashiCorp, Inc."
+    appCopyright: "Copyright © 2021 HashiCorp, Inc.",
+    osxSign: {
+      identity: process.env.BOUNDARY_DESKTOP_SIGNING_IDENTITY,
+      "hardened-runtime": true,
+      entitlements: "./config/macos/entitlements.plist",
+      "entitlements-inherit": "./config/macos/entitlements.plist",
+      "signature-flags": "library"
+    }
   },
   makers: [
     {