Remove double signing and use the proper extraFiles for safari extension

This commit is contained in:
Hinton 2024-01-30 17:45:59 +01:00
parent e7b534ba64
commit 94635dbd02
No known key found for this signature in database
GPG Key ID: 5F7295599C5D965C
2 changed files with 8 additions and 36 deletions

View File

@ -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,

View File

@ -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);