From 368c63644fdc396a5ea77762f79a272ecde67d9a Mon Sep 17 00:00:00 2001 From: Robert Koch Date: Sun, 23 Jun 2024 12:46:18 +1000 Subject: [PATCH 1/3] Update package.json --- packages/app-builder-lib/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/app-builder-lib/package.json b/packages/app-builder-lib/package.json index 06454660e80..73293700fcb 100644 --- a/packages/app-builder-lib/package.json +++ b/packages/app-builder-lib/package.json @@ -47,7 +47,7 @@ "homepage": "https://github.com/electron-userland/electron-builder", "dependencies": { "@develar/schema-utils": "~2.6.5", - "@electron/notarize": "2.3.0", + "@electron/notarize": "2.3.2", "@electron/osx-sign": "1.3.0", "@electron/rebuild": "3.6.0", "@electron/universal": "2.0.1", From 35daaf4a96e9757afb92f1839a311c06efdb22d9 Mon Sep 17 00:00:00 2001 From: Mike Maietta Date: Tue, 25 Jun 2024 10:34:10 -0700 Subject: [PATCH 2/3] update lockfile and add changeset --- .changeset/tender-countries-drive.md | 5 +++++ pnpm-lock.yaml | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 .changeset/tender-countries-drive.md diff --git a/.changeset/tender-countries-drive.md b/.changeset/tender-countries-drive.md new file mode 100644 index 00000000000..3ee5cbdd280 --- /dev/null +++ b/.changeset/tender-countries-drive.md @@ -0,0 +1,5 @@ +--- +"app-builder-lib": patch +--- + +fix: update @electron/notarize to latest version diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e0bd94e235a..023afb7adae 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -105,8 +105,8 @@ importers: specifier: ~2.6.5 version: 2.6.5 '@electron/notarize': - specifier: 2.3.0 - version: 2.3.0 + specifier: 2.3.2 + version: 2.3.2 '@electron/osx-sign': specifier: 1.3.0 version: 1.3.0 @@ -2301,8 +2301,8 @@ packages: minimatch: 3.1.2 dev: false - /@electron/notarize@2.3.0: - resolution: {integrity: sha512-EiTBU0BwE7HZZjAG1fFWQaiQpCuPrVGn7jPss1kUjD6eTTdXXd29RiZqEqkgN7xqt/Pgn4g3I7Saqovanrfj3w==} + /@electron/notarize@2.3.2: + resolution: {integrity: sha512-zfayxCe19euNwRycCty1C7lF7snk9YwfRpB5M8GLr1a4ICH63znxaPNAubrMvj0yDvVozqfgsdYpXVUnpWBDpg==} engines: {node: '>= 10.0.0'} dependencies: debug: 4.3.4 From 6c93954a05e3aecbff541b85569c6562337dfda9 Mon Sep 17 00:00:00 2001 From: Mike Maietta Date: Tue, 25 Jun 2024 10:41:30 -0700 Subject: [PATCH 3/3] remove deprecated `legacy` notarize tool --- packages/app-builder-lib/src/index.ts | 2 +- packages/app-builder-lib/src/macPackager.ts | 6 +++--- .../app-builder-lib/src/options/macOptions.ts | 16 +--------------- 3 files changed, 5 insertions(+), 19 deletions(-) diff --git a/packages/app-builder-lib/src/index.ts b/packages/app-builder-lib/src/index.ts index b47c3add6a2..5600de27858 100644 --- a/packages/app-builder-lib/src/index.ts +++ b/packages/app-builder-lib/src/index.ts @@ -26,7 +26,7 @@ export { Configuration, AfterPackContext, MetadataDirectories } from "./configur export { ElectronBrandingOptions, ElectronDownloadOptions, ElectronPlatformName } from "./electron/ElectronFramework" export { PlatformSpecificBuildOptions, AsarOptions, FileSet, Protocol, ReleaseInfo } from "./options/PlatformSpecificBuildOptions" export { FileAssociation } from "./options/FileAssociation" -export { MacConfiguration, DmgOptions, MasConfiguration, MacOsTargetName, DmgContent, DmgWindow, NotarizeLegacyOptions, NotarizeNotaryOptions } from "./options/macOptions" +export { MacConfiguration, DmgOptions, MasConfiguration, MacOsTargetName, DmgContent, DmgWindow, NotarizeNotaryOptions } from "./options/macOptions" export { PkgOptions, PkgBackgroundOptions, BackgroundAlignment, BackgroundScaling } from "./options/pkgOptions" export { WindowsConfiguration } from "./options/winOptions" export { AppXOptions } from "./options/AppXOptions" diff --git a/packages/app-builder-lib/src/macPackager.ts b/packages/app-builder-lib/src/macPackager.ts index aa789cca62d..0a94c313115 100644 --- a/packages/app-builder-lib/src/macPackager.ts +++ b/packages/app-builder-lib/src/macPackager.ts @@ -19,8 +19,8 @@ import { createCommonTarget, NoOpTarget } from "./targets/targetFactory" import { isMacOsHighSierra } from "./util/macosVersion" import { getTemplatePath } from "./util/pathManager" import * as fs from "fs/promises" -import { notarize, NotarizeOptions } from "@electron/notarize" -import { NotaryToolKeychainCredentials } from "@electron/notarize/lib/types" +import { notarize } from "@electron/notarize" +import { NotarizeOptionsNotaryTool, NotaryToolKeychainCredentials } from "@electron/notarize/lib/types" export type CustomMacSignOptions = SignOptions export type CustomMacSign = (configuration: CustomMacSignOptions, packager: MacPackager) => Promise @@ -505,7 +505,7 @@ export class MacPackager extends PlatformPackager { log.info(null, "notarization successful") } - private getNotarizeOptions(appPath: string): NotarizeOptions | undefined { + private getNotarizeOptions(appPath: string): NotarizeOptionsNotaryTool | undefined { let teamId = process.env.APPLE_TEAM_ID const appleId = process.env.APPLE_ID const appleIdPassword = process.env.APPLE_APP_SPECIFIC_PASSWORD diff --git a/packages/app-builder-lib/src/options/macOptions.ts b/packages/app-builder-lib/src/options/macOptions.ts index 75343067116..3c6f0bae26b 100644 --- a/packages/app-builder-lib/src/options/macOptions.ts +++ b/packages/app-builder-lib/src/options/macOptions.ts @@ -231,21 +231,7 @@ export interface MacConfiguration extends PlatformSpecificBuildOptions { * * For security reasons it is recommended to use the first option (see https://github.com/electron-userland/electron-builder/issues/7859) */ - readonly notarize?: NotarizeLegacyOptions | NotarizeNotaryOptions | boolean | null -} - -/** @deprecated */ -export interface NotarizeLegacyOptions { - /** - * The app bundle identifier your Electron app is using. E.g. com.github.electron. Useful if notarization ID differs from app ID (unlikely). - * Only used by `legacy` notarization tool - */ - readonly appBundleId?: string | null - - /** - * Your Team Short Name. Only used by `legacy` notarization tool - */ - readonly ascProvider?: string | null + readonly notarize?: NotarizeNotaryOptions | boolean | null } export interface NotarizeNotaryOptions {