Skip to content
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

Jump to bottom

fix: vite mergeConfig doesn't accept callback params #568

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

fix: vite mergeConfig doesn't accept callback params #568

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cedac72
fix: vite mergeConfig doesn't accept callback params
BBoehm Jul 31, 2023
f392512
fix: vite mergeConfig doesn't accept callback params
BBoehm Jul 31, 2023
052d53f
Merge remote-tracking branch 'origin/fix/vite_merge-config_callback_p…
BBoehm Jul 31, 2023
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
18 changes: 11 additions & 7 deletions packages/histoire/src/node/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,14 +174,18 @@ export async function loadConfigFile (configFile: string): Promise<Partial<Histo
export const mergeConfig = createDefu((obj: any, key, value) => {
if (obj[key] && key === 'vite') {
const initialValue = obj[key]
if (typeof value === 'function') {
obj[key] = async (...args) => {
const result = await value(...args)
return mergeViteConfig(initialValue, result)
}
} else {
obj[key] = mergeViteConfig(initialValue, value)

// Convert to functions
const initialFn: (...args: any[]) => Promise<any> = typeof initialValue === 'function' ? initialValue : async () => initialValue
const valueFn: (...args: any[]) => Promise<any> = typeof value === 'function' ? value : async () => value

obj[key] = async (...args) => {
// `mergeViteConfig` doesn't accept functions so we need to call them
const initialResult = await initialFn(...args)
const valueResult = await valueFn(...args)
return mergeViteConfig(initialResult, valueResult)
}

return true
}

Expand Down
Loading