Skip to content

Commit 8e36be1

Browse files
authoredMar 26, 2024··
feat: export Packager sub-classes from main electron-builder types (#8153)
1 parent a999da4 commit 8e36be1

File tree

12 files changed

+1881
-299
lines changed

12 files changed

+1881
-299
lines changed
 

‎.changeset/serious-nails-shop.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"app-builder-lib": minor
3+
"dmg-builder": minor
4+
"electron-builder": minor
5+
---
6+
7+
feat: export Packager sub-classes from main electron-builder types

‎docs/api/electron-builder.md

+1,858-290
Large diffs are not rendered by default.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { Configuration } from "../configuration"
77
import { BeforeCopyExtraFilesOptions, Framework, PrepareApplicationStageDirectoryOptions } from "../Framework"
88
import { Packager, Platform } from "../index"
99
import { LinuxPackager } from "../linuxPackager"
10-
import MacPackager from "../macPackager"
10+
import { MacPackager } from "../macPackager"
1111
import { getTemplatePath } from "../util/pathManager"
1212
import { createMacApp } from "./electronMac"
1313
import { computeElectronVersion, getElectronVersionFromInstalled } from "./electronVersion"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { rename, utimes } from "fs/promises"
55
import * as path from "path"
66
import { filterCFBundleIdentifier } from "../appInfo"
77
import { AsarIntegrity } from "../asar/integrity"
8-
import MacPackager from "../macPackager"
8+
import { MacPackager } from "../macPackager"
99
import { normalizeExt } from "../platformPackager"
1010
import { executeAppBuilderAndWriteJson, executeAppBuilderAsJson } from "../util/appBuilder"
1111
import { createBrandingOpts } from "./ElectronFramework"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { AfterPackContext } from "../configuration"
66
import { Platform } from "../core"
77
import { Framework, PrepareApplicationStageDirectoryOptions } from "../Framework"
88
import { LinuxPackager } from "../linuxPackager"
9-
import MacPackager from "../macPackager"
9+
import { MacPackager } from "../macPackager"
1010
import { executeAppBuilderAndWriteJson } from "../util/appBuilder"
1111

1212
export class LibUiFramework implements Framework {

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

+4
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ export { SnapOptions, PlugDescriptor, SlotDescriptor } from "./options/SnapOptio
3939
export { Metadata, AuthorMetadata, RepositoryInfo } from "./options/metadata"
4040
export { AppInfo } from "./appInfo"
4141
export { SquirrelWindowsOptions } from "./options/SquirrelWindowsOptions"
42+
4243
export { CustomMacSign, CustomMacSignOptions } from "./macPackager"
4344
export {
4445
WindowsSignOptions,
@@ -54,6 +55,9 @@ export { PublishManager } from "./publish/PublishManager"
5455
export { PlatformPackager } from "./platformPackager"
5556
export { Framework, PrepareApplicationStageDirectoryOptions } from "./Framework"
5657
export { buildForge, ForgeOptions } from "./forge-maker"
58+
export { LinuxPackager } from "./linuxPackager"
59+
export { WinPackager } from "./winPackager"
60+
export { MacPackager } from "./macPackager"
5761

5862
const expectedOptions = new Set(["publish", "targets", "mac", "win", "linux", "projectDir", "platformPackagerFactory", "config", "effectiveOptionComputed", "prepackaged"])
5963

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import {
3131
export type CustomMacSignOptions = SignOptions
3232
export type CustomMacSign = (configuration: CustomMacSignOptions, packager: MacPackager) => Promise<void>
3333

34-
export default class MacPackager extends PlatformPackager<MacConfiguration> {
34+
export class MacPackager extends PlatformPackager<MacConfiguration> {
3535
readonly codeSigningInfo = new Lazy<CodeSigningInfo>(() => {
3636
const cscLink = this.getCscLink()
3737
if (cscLink == null || process.platform !== "darwin") {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ export class Packager {
473473

474474
switch (platform) {
475475
case Platform.MAC: {
476-
const helperClass = (await import("./macPackager")).default
476+
const helperClass = (await import("./macPackager")).MacPackager
477477
return new helperClass(this)
478478
}
479479

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import * as path from "path"
88
import { filterCFBundleIdentifier } from "../appInfo"
99
import { findIdentity, Identity } from "../codeSign/macCodeSign"
1010
import { Target } from "../core"
11-
import MacPackager from "../macPackager"
11+
import { MacPackager } from "../macPackager"
1212
import { readdirSync } from "fs"
1313

1414
const certType = "Developer ID Installer"

‎packages/dmg-builder/src/dmg.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { DmgOptions, Target } from "app-builder-lib"
22
import { findIdentity, isSignAllowed } from "app-builder-lib/out/codeSign/macCodeSign"
3-
import MacPackager from "app-builder-lib/out/macPackager"
3+
import { MacPackager } from "app-builder-lib/out/macPackager"
44
import { createBlockmap } from "app-builder-lib/out/targets/differentialUpdateInfoBuilder"
55
import { executeAppBuilderAsJson } from "app-builder-lib/out/util/appBuilder"
66
import { sanitizeFileName } from "app-builder-lib/out/util/filename"

‎packages/electron-builder/src/index.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export { getArchSuffix, Arch, archFromString } from "builder-util"
1+
export { getArchSuffix, Arch, archFromString, log } from "builder-util"
22
export { build, CliOptions, createTargets } from "./builder"
33
export {
44
TargetConfiguration,
@@ -63,6 +63,9 @@ export {
6363
PublishManager,
6464
PublishOptions,
6565
ProgressInfo,
66+
MacPackager,
67+
WinPackager,
68+
LinuxPackager,
6669
} from "app-builder-lib"
6770
export { buildForge, ForgeOptions } from "app-builder-lib"
6871
export { CancellationToken } from "builder-util-runtime"

‎test/src/helpers/CheckingPackager.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { AsyncTaskManager } from "builder-util"
22
import { Arch, MacConfiguration, Packager, Target } from "electron-builder"
33
import SquirrelWindowsTarget from "electron-builder-squirrel-windows"
44
import { Identity } from "app-builder-lib/out/codeSign/macCodeSign"
5-
import MacPackager from "app-builder-lib/out/macPackager"
5+
import { MacPackager } from "app-builder-lib/out/macPackager"
66
import { DmgTarget } from "dmg-builder"
77
import { WinPackager } from "app-builder-lib/out/winPackager"
88
import { SignOptions as MacSignOptions } from "@electron/osx-sign/dist/cjs/types"

0 commit comments

Comments
 (0)
Please sign in to comment.