Skip to content

Commit dcd5d9f

Browse files
committed
fix: vite mergeConfig doesn't accept callback params
1 parent 9209381 commit dcd5d9f

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

packages/histoire/src/node/config.ts

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -184,14 +184,18 @@ export const mergeBuildConfig = createDefu((obj: any, key, value) => {
184184
export const mergeConfig = createDefu((obj: any, key, value) => {
185185
if (obj[key] && key === 'vite') {
186186
const initialValue = obj[key]
187-
if (typeof value === 'function') {
188-
obj[key] = async (...args) => {
189-
const result = await value(...args)
190-
return mergeViteConfig(initialValue, result)
191-
}
192-
} else {
193-
obj[key] = mergeViteConfig(initialValue, value)
187+
188+
// Convert to functions
189+
const initialFn: (...args: any[]) => Promise<any> = typeof initialValue === 'function' ? initialValue : async () => initialValue
190+
const valueFn: (...args: any[]) => Promise<any> = typeof value === 'function' ? value : async () => value
191+
192+
obj[key] = async (...args) => {
193+
// `mergeViteConfig` doesn't accept functions so we need to call them
194+
const initialResult = await initialFn(...args)
195+
const valueResult = await valueFn(...args)
196+
return mergeViteConfig(initialResult, valueResult)
194197
}
198+
195199
return true
196200
}
197201

0 commit comments

Comments
 (0)