Skip to content

Commit 9dc13ba

Browse files
authored
fix: Merge arrays from same config key in cascading electron-builder configs, such as files (#6841)
1 parent e9ba750 commit 9dc13ba

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

.changeset/good-cooks-sniff.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"builder-util": patch
3+
---
4+
5+
fix: Merge arrays from same config key in cascading electron-builder configs, such as `files`

packages/builder-util/src/deepAssign.ts

+6-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,12 @@ function assignKey(target: any, from: any, key: string) {
1616

1717
const prevValue = target[key]
1818
if (prevValue == null || value == null || !isObject(prevValue) || !isObject(value)) {
19-
target[key] = value
19+
// Merge arrays.
20+
if (Array.isArray(prevValue) && Array.isArray(value)) {
21+
target[key] = prevValue.concat(value)
22+
} else {
23+
target[key] = value
24+
}
2025
} else {
2126
target[key] = assign(prevValue, value)
2227
}

0 commit comments

Comments
 (0)