Skip to content

Commit f03addd

Browse files
authoredApr 29, 2024··
fix(iis): deep merge configs (#2358)
1 parent 20b26a7 commit f03addd

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed
 

‎src/presets/iis.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { readFile } from "node:fs/promises";
22
import { resolve } from "pathe";
3+
import { defu } from "defu";
34
import { resolveFile, writeFile } from "../utils";
45
import { defineNitroPreset } from "../preset";
56
import type { Nitro } from "../types";
@@ -116,7 +117,7 @@ async function iisnodeXmlTemplate(nitro: Nitro) {
116117
await parseXmlDoc(fileString);
117118

118119
if (nitro.options.iis?.mergeConfig && !nitro.options.iis.overrideConfig) {
119-
return buildNewXmlDoc({ ...originalWebConfig, ...fileWebConfig });
120+
return buildNewXmlDoc(defu(fileWebConfig, originalWebConfig));
120121
} else if (nitro.options.iis?.overrideConfig) {
121122
return buildNewXmlDoc({ ...fileWebConfig });
122123
}
@@ -149,7 +150,7 @@ async function iisXmlTemplate(nitro: Nitro) {
149150
await parseXmlDoc(fileString);
150151

151152
if (nitro.options.iis?.mergeConfig && !nitro.options.iis.overrideConfig) {
152-
return buildNewXmlDoc({ ...originalWebConfig, ...fileWebConfig });
153+
return buildNewXmlDoc(defu(fileWebConfig, originalWebConfig));
153154
} else if (nitro.options.iis?.overrideConfig) {
154155
return buildNewXmlDoc({ ...fileWebConfig });
155156
}

0 commit comments

Comments
 (0)
Please sign in to comment.