From b7798f7faea109224be0612d19d598bb70fc4754 Mon Sep 17 00:00:00 2001 From: Erik Moura Date: Thu, 9 Mar 2023 20:58:07 -0300 Subject: [PATCH 1/2] fix(plugin-fuses): set `resetAdHocDarwinSignature` to `true` on `platform=mas` when the `osxSign` config is missing --- packages/plugin/fuses/src/FusesPlugin.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/plugin/fuses/src/FusesPlugin.ts b/packages/plugin/fuses/src/FusesPlugin.ts index 392ccdac80..8eec47c35e 100644 --- a/packages/plugin/fuses/src/FusesPlugin.ts +++ b/packages/plugin/fuses/src/FusesPlugin.ts @@ -1,7 +1,7 @@ import path from 'path'; import { namedHookWithTaskFn, PluginBase } from '@electron-forge/plugin-base'; -import { ForgeMultiHookMap } from '@electron-forge/shared-types'; +import { ForgeMultiHookMap, ForgePlatform } from '@electron-forge/shared-types'; import { flipFuses, FuseConfig } from '@electron/fuses'; import { getElectronExecutablePath } from './util/getElectronExecutablePath'; @@ -22,9 +22,11 @@ export default class FusesPlugin extends PluginBase { packageAfterCopy: namedHookWithTaskFn<'packageAfterCopy'>(async (listrTask, resolvedForgeConfig, resourcesPath, electronVersion, platform, arch) => { const { fusesConfig } = this; + const applePlatforms: ForgePlatform[] = ['darwin', 'mas']; + if (Object.keys(fusesConfig).length) { const pathToElectronExecutable = getElectronExecutablePath({ - appName: ['darwin', 'mas'].includes(platform) ? 'Electron' : 'electron', + appName: applePlatforms.includes(platform) ? 'Electron' : 'electron', basePath: path.resolve(resourcesPath, '../..'), platform, }); @@ -33,7 +35,7 @@ export default class FusesPlugin extends PluginBase { const hasOSXSignConfig = (typeof osxSignConfig === 'object' && Boolean(Object.keys(osxSignConfig).length)) || Boolean(osxSignConfig); await flipFuses(pathToElectronExecutable, { - resetAdHocDarwinSignature: !hasOSXSignConfig && platform === 'darwin' && arch === 'arm64', + resetAdHocDarwinSignature: !hasOSXSignConfig && applePlatforms.includes(platform) && arch === 'arm64', ...this.fusesConfig, }); } From 6f4cf9f8e1aa8b9d671bd847f527817e0b064d65 Mon Sep 17 00:00:00 2001 From: Erik Moura Date: Thu, 9 Mar 2023 21:05:29 -0300 Subject: [PATCH 2/2] docs(plugin-fuses): fixed minor typo in the README --- packages/plugin/fuses/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/plugin/fuses/README.md b/packages/plugin/fuses/README.md index 3d93ab4d57..4d64e8beb5 100644 --- a/packages/plugin/fuses/README.md +++ b/packages/plugin/fuses/README.md @@ -5,7 +5,7 @@ This plugin allows flipping [Electron Fuses](https://github.com/electron/fuses) ## Usage -Install `@electron-forge/plugin-fuses` and `@electron/fuses` as dev dependencies and add this plugin to the `plugins` array in your Forge configuration:: +Install `@electron-forge/plugin-fuses` and `@electron/fuses` as dev dependencies and add this plugin to the `plugins` array in your Forge configuration: ```shell # Yarn yarn add --dev @electron-forge/plugin-fuses @electron/fuses