Skip to content

Commit 8d55c1b

Browse files
authored
additional should not be merged
1 parent 145e79b commit 8d55c1b

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

lib/config.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,12 @@ export function getMergedConfig(dir, home, additional) {
3232
...Object.getOwnPropertyDescriptors(globalConfig),
3333
...Object.getOwnPropertyDescriptors(projectConfig),
3434
...Object.getOwnPropertyDescriptors(localConfig),
35-
...(additional && Object.getOwnPropertyDescriptors(additional)),
3635
});
3736
}
38-
return mergedConfig;
37+
return additional ? Object.create(null, {
38+
...Object.getOwnPropertyDescriptors(mergedConfig),
39+
...Object.getOwnPropertyDescriptors(additional),
40+
}) : mergedConfig;
3941
};
4042
export function clearCachedConfig() {
4143
mergedConfig = null;

0 commit comments

Comments
 (0)