Skip to content

Commit c36f6c8

Browse files
Evoksdevelar
authored andcommitted
fix(mac): add needed helpers for electron 6.0.0 (#4111)
* - fix electron mac : add needed helpers for electron 6.0.0 * - removed semicolons * - removed a last semicolon
1 parent c031b87 commit c36f6c8

File tree

1 file changed

+40
-6
lines changed

1 file changed

+40
-6
lines changed

packages/app-builder-lib/src/electron/electronMac.ts

Lines changed: 40 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,24 @@ function moveHelpers(helperSuffixes: Array<string>, frameworksPath: string, appN
2121
})
2222
}
2323

24-
function getAvailableHelperSuffixes(helperEHPlist: string | null, helperNPPlist: string | null) {
24+
function getAvailableHelperSuffixes(helperEHPlist: string | null, helperNPPlist: string | null, helperRendererPlist: string | null, helperPluginPlist: string | null, helperGPUPlist: string | null) {
25+
2526
const result = [" Helper"]
2627
if (helperEHPlist != null) {
2728
result.push(" Helper EH")
2829
}
2930
if (helperNPPlist != null) {
3031
result.push(" Helper NP")
3132
}
33+
if (helperRendererPlist != null) {
34+
result.push(" Helper (Renderer)")
35+
}
36+
if (helperPluginPlist != null) {
37+
result.push(" Helper (Plugin)")
38+
}
39+
if (helperGPUPlist != null) {
40+
result.push(" Helper (GPU)")
41+
}
3242
return result
3343
}
3444

@@ -45,9 +55,12 @@ export async function createMacApp(packager: MacPackager, appOutDir: string, asa
4555
const helperPlistFilename = path.join(frameworksPath, "Electron Helper.app", "Contents", "Info.plist")
4656
const helperEHPlistFilename = path.join(frameworksPath, "Electron Helper EH.app", "Contents", "Info.plist")
4757
const helperNPPlistFilename = path.join(frameworksPath, "Electron Helper NP.app", "Contents", "Info.plist")
58+
const helperRendererPlistFilename = path.join(frameworksPath, "Electron Helper (Renderer).app", "Contents", "Info.plist")
59+
const helperPluginPlistFilename = path.join(frameworksPath, "Electron Helper (Plugin).app", "Contents", "Info.plist")
60+
const helperGPUPlistFilename = path.join(frameworksPath, "Electron Helper (GPU).app", "Contents", "Info.plist")
4861
const helperLoginPlistFilename = path.join(loginItemPath, "Electron Login Helper.app", "Contents", "Info.plist")
4962

50-
const plistContent: Array<any> = await executeAppBuilderAsJson(["decode-plist", "-f", appPlistFilename, "-f", helperPlistFilename, "-f", helperEHPlistFilename, "-f", helperNPPlistFilename, "-f", helperLoginPlistFilename])
63+
const plistContent: Array<any> = await executeAppBuilderAsJson(["decode-plist", "-f", appPlistFilename, "-f", helperPlistFilename, "-f", helperEHPlistFilename, "-f", helperNPPlistFilename, "-f", helperRendererPlistFilename, "-f", helperPluginPlistFilename, "-f", helperGPUPlistFilename, "-f", helperLoginPlistFilename])
5164

5265
if (plistContent[0] == null) {
5366
throw new Error("corrupted Electron dist")
@@ -57,11 +70,14 @@ export async function createMacApp(packager: MacPackager, appOutDir: string, asa
5770
const helperPlist = plistContent[1]!!
5871
const helperEHPlist = plistContent[2]
5972
const helperNPPlist = plistContent[3]
60-
const helperLoginPlist = plistContent[4]
73+
const helperRendererPlist = plistContent[4]
74+
const helperPluginPlist = plistContent[5]
75+
const helperGPUPlist = plistContent[6]
76+
const helperLoginPlist = plistContent[7]
6177

6278
// if an extend-info file was supplied, copy its contents in first
63-
if (plistContent[5] != null) {
64-
Object.assign(appPlist, plistContent[5])
79+
if (plistContent[8] != null) {
80+
Object.assign(appPlist, plistContent[8])
6581
}
6682

6783
const buildMetadata = packager.config!!
@@ -90,6 +106,15 @@ export async function createMacApp(packager: MacPackager, appOutDir: string, asa
90106
helper.CFBundleVersion = appPlist.CFBundleVersion
91107
}
92108

109+
if (helperRendererPlist != null) {
110+
configureHelper(helperRendererPlist, "(Renderer)")
111+
}
112+
if (helperPluginPlist != null) {
113+
configureHelper(helperPluginPlist, "(Plugin)")
114+
}
115+
if (helperGPUPlist != null) {
116+
configureHelper(helperGPUPlist, "(GPU)")
117+
}
93118
if (helperEHPlist != null) {
94119
configureHelper(helperEHPlist, "EH")
95120
}
@@ -158,6 +183,15 @@ export async function createMacApp(packager: MacPackager, appOutDir: string, asa
158183
if (helperNPPlist != null) {
159184
plistDataToWrite[helperNPPlistFilename] = helperNPPlist
160185
}
186+
if (helperRendererPlist != null) {
187+
plistDataToWrite[helperRendererPlistFilename] = helperRendererPlist
188+
}
189+
if (helperPluginPlist != null) {
190+
plistDataToWrite[helperPluginPlistFilename] = helperPluginPlist
191+
}
192+
if (helperGPUPlist != null) {
193+
plistDataToWrite[helperGPUPlistFilename] = helperGPUPlist
194+
}
161195
if (helperLoginPlist != null) {
162196
plistDataToWrite[helperLoginPlistFilename] = helperLoginPlist
163197
}
@@ -169,7 +203,7 @@ export async function createMacApp(packager: MacPackager, appOutDir: string, asa
169203
unlinkIfExists(path.join(appOutDir, "LICENSES.chromium.html")),
170204
])
171205

172-
await moveHelpers(getAvailableHelperSuffixes(helperEHPlist, helperNPPlist), frameworksPath, appFilename, "Electron")
206+
await moveHelpers(getAvailableHelperSuffixes(helperEHPlist, helperNPPlist, helperRendererPlist, helperPluginPlist, helperGPUPlist), frameworksPath, appFilename, "Electron")
173207

174208
if (helperLoginPlist != null) {
175209
const prefix = "Electron"

0 commit comments

Comments
 (0)