Skip to content

feat: electron/universal has a new minimatch option 'x64ArchFiles' #6913

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 5, 2022
Merged

feat: electron/universal has a new minimatch option 'x64ArchFiles' #6913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e07172
electron/universal has a new minimatch option 'x64ArchFiles'
obra Jun 1, 2022
8a1f846
Add x64ArchFiles to the macConfiguration definition.
obra Jun 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/famous-cheetahs-run.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"app-builder-lib": minor
---

Expose electron/universal's new "x64ArchFiles" option to allow building universal binaries with single-architecture dependencies
1 change: 1 addition & 0 deletions packages/app-builder-lib/src/macPackager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ export default class MacPackager extends PlatformPackager<MacConfiguration> {
force: true,
mergeASARs: platformSpecificBuildOptions.mergeASARs ?? true,
singleArchFiles: platformSpecificBuildOptions.singleArchFiles,
x64ArchFiles: platformSpecificBuildOptions.x64ArchFiles,
})
await fs.rm(x64AppOutDir, { recursive: true, force: true })
await fs.rm(arm64AppOutPath, { recursive: true, force: true })
Expand Down
9 changes: 9 additions & 0 deletions packages/app-builder-lib/src/options/macOptions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,15 @@ export interface MacConfiguration extends PlatformSpecificBuildOptions {
* only if `mergeASARs` is `true`.
*/
readonly singleArchFiles?: string

/**
* Minimatch pattern of paths that are allowed to be x64 binaries in both
* ASAR files
*
* This option has no effect unless building for "universal" arch and applies
* only if `mergeASARs` is `true`.
*/
readonly x64ArchFiles?: string
}

export interface DmgOptions extends TargetSpecificOptions {
Expand Down