feat: export Packager sub-classes from main electron-builder types (#…

…8153)

.changeset/serious-nails-shop.md

@@ -0,0 +1,7 @@
+---
+"app-builder-lib": minor
+"dmg-builder": minor
+"electron-builder": minor
+---
+
+feat: export Packager sub-classes from main electron-builder types

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

@@ -7,7 +7,7 @@ import { Configuration } from "../configuration"
 import { BeforeCopyExtraFilesOptions, Framework, PrepareApplicationStageDirectoryOptions } from "../Framework"
 import { Packager, Platform } from "../index"
 import { LinuxPackager } from "../linuxPackager"
-import MacPackager from "../macPackager"
+import { MacPackager } from "../macPackager"
 import { getTemplatePath } from "../util/pathManager"
 import { createMacApp } from "./electronMac"
 import { computeElectronVersion, getElectronVersionFromInstalled } from "./electronVersion"

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

@@ -5,7 +5,7 @@ import { rename, utimes } from "fs/promises"
 import * as path from "path"
 import { filterCFBundleIdentifier } from "../appInfo"
 import { AsarIntegrity } from "../asar/integrity"
-import MacPackager from "../macPackager"
+import { MacPackager } from "../macPackager"
 import { normalizeExt } from "../platformPackager"
 import { executeAppBuilderAndWriteJson, executeAppBuilderAsJson } from "../util/appBuilder"
 import { createBrandingOpts } from "./ElectronFramework"

packages/app-builder-lib/src/frameworks/LibUiFramework.ts

@@ -6,7 +6,7 @@ import { AfterPackContext } from "../configuration"
 import { Platform } from "../core"
 import { Framework, PrepareApplicationStageDirectoryOptions } from "../Framework"
 import { LinuxPackager } from "../linuxPackager"
-import MacPackager from "../macPackager"
+import { MacPackager } from "../macPackager"
 import { executeAppBuilderAndWriteJson } from "../util/appBuilder"
 
 export class LibUiFramework implements Framework {

packages/app-builder-lib/src/index.ts

@@ -39,6 +39,7 @@ export { SnapOptions, PlugDescriptor, SlotDescriptor } from "./options/SnapOptio
 export { Metadata, AuthorMetadata, RepositoryInfo } from "./options/metadata"
 export { AppInfo } from "./appInfo"
 export { SquirrelWindowsOptions } from "./options/SquirrelWindowsOptions"
+
 export { CustomMacSign, CustomMacSignOptions } from "./macPackager"
 export {
   WindowsSignOptions,
@@ -54,6 +55,9 @@ export { PublishManager } from "./publish/PublishManager"
 export { PlatformPackager } from "./platformPackager"
 export { Framework, PrepareApplicationStageDirectoryOptions } from "./Framework"
 export { buildForge, ForgeOptions } from "./forge-maker"
+export { LinuxPackager } from "./linuxPackager"
+export { WinPackager } from "./winPackager"
+export { MacPackager } from "./macPackager"
 
 const expectedOptions = new Set(["publish", "targets", "mac", "win", "linux", "projectDir", "platformPackagerFactory", "config", "effectiveOptionComputed", "prepackaged"])
 

packages/app-builder-lib/src/macPackager.ts

@@ -31,7 +31,7 @@ import {
 export type CustomMacSignOptions = SignOptions
 export type CustomMacSign = (configuration: CustomMacSignOptions, packager: MacPackager) => Promise<void>
 
-export default class MacPackager extends PlatformPackager<MacConfiguration> {
+export class MacPackager extends PlatformPackager<MacConfiguration> {
   readonly codeSigningInfo = new Lazy<CodeSigningInfo>(() => {
     const cscLink = this.getCscLink()
     if (cscLink == null || process.platform !== "darwin") {

packages/app-builder-lib/src/packager.ts

@@ -473,7 +473,7 @@ export class Packager {
 
     switch (platform) {
       case Platform.MAC: {
-        const helperClass = (await import("./macPackager")).default
+        const helperClass = (await import("./macPackager")).MacPackager
         return new helperClass(this)
       }
 

packages/app-builder-lib/src/targets/pkg.ts

@@ -8,7 +8,7 @@ import * as path from "path"
 import { filterCFBundleIdentifier } from "../appInfo"
 import { findIdentity, Identity } from "../codeSign/macCodeSign"
 import { Target } from "../core"
-import MacPackager from "../macPackager"
+import { MacPackager } from "../macPackager"
 import { readdirSync } from "fs"
 
 const certType = "Developer ID Installer"

packages/dmg-builder/src/dmg.ts

@@ -1,6 +1,6 @@
 import { DmgOptions, Target } from "app-builder-lib"
 import { findIdentity, isSignAllowed } from "app-builder-lib/out/codeSign/macCodeSign"
-import MacPackager from "app-builder-lib/out/macPackager"
+import { MacPackager } from "app-builder-lib/out/macPackager"
 import { createBlockmap } from "app-builder-lib/out/targets/differentialUpdateInfoBuilder"
 import { executeAppBuilderAsJson } from "app-builder-lib/out/util/appBuilder"
 import { sanitizeFileName } from "app-builder-lib/out/util/filename"

packages/electron-builder/src/index.ts

@@ -1,4 +1,4 @@
-export { getArchSuffix, Arch, archFromString } from "builder-util"
+export { getArchSuffix, Arch, archFromString, log } from "builder-util"
 export { build, CliOptions, createTargets } from "./builder"
 export {
   TargetConfiguration,
@@ -63,6 +63,9 @@ export {
   PublishManager,
   PublishOptions,
   ProgressInfo,
+  MacPackager,
+  WinPackager,
+  LinuxPackager,
 } from "app-builder-lib"
 export { buildForge, ForgeOptions } from "app-builder-lib"
 export { CancellationToken } from "builder-util-runtime"

test/src/helpers/CheckingPackager.ts

@@ -2,7 +2,7 @@ import { AsyncTaskManager } from "builder-util"
 import { Arch, MacConfiguration, Packager, Target } from "electron-builder"
 import SquirrelWindowsTarget from "electron-builder-squirrel-windows"
 import { Identity } from "app-builder-lib/out/codeSign/macCodeSign"
-import MacPackager from "app-builder-lib/out/macPackager"
+import { MacPackager } from "app-builder-lib/out/macPackager"
 import { DmgTarget } from "dmg-builder"
 import { WinPackager } from "app-builder-lib/out/winPackager"
 import { SignOptions as MacSignOptions } from "@electron/osx-sign/dist/cjs/types"