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

refactor: config hook helper function #9982

Merged
merged 2 commits into from Sep 5, 2022
Merged

refactor: config hook helper function #9982

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01415db
refactor: config hook helper function
Sep 4, 2022
bcce868
chore: rename mergeConfigHook to runConfigHook
Sep 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
47 changes: 27 additions & 20 deletions packages/vite/src/node/config.ts
View file
Open in desktop
Expand Up @@ -442,16 +442,7 @@ export async function resolveConfig(

// run config hooks
const userPlugins = [...prePlugins, ...normalPlugins, ...postPlugins]
for (const p of getSortedPluginsByHook('config', userPlugins)) {
const hook = p.config
const handler = hook && 'handler' in hook ? hook.handler : hook
if (handler) {
const res = await handler(config, configEnv)
if (res) {
config = mergeConfig(config, res)
}
}
}
config = await mergeHookConfig(config, userPlugins, configEnv)

if (process.env.VITE_TEST_WITHOUT_PLUGIN_COMMONJS) {
config = mergeConfig(config, {
Expand Down Expand Up @@ -611,16 +602,11 @@ export async function resolveConfig(
...workerNormalPlugins,
...workerPostPlugins
]
for (const p of getSortedPluginsByHook('config', workerUserPlugins)) {
const hook = p.config
const handler = hook && 'handler' in hook ? hook.handler : hook
if (handler) {
const res = await handler(workerConfig, configEnv)
if (res) {
workerConfig = mergeConfig(workerConfig, res)
}
}
}
workerConfig = await mergeHookConfig(
workerConfig,
workerUserPlugins,
configEnv
)
const resolvedWorkerOptions: ResolveWorkerOptions = {
format: workerConfig.worker?.format || 'iife',
plugins: [],
Expand Down Expand Up @@ -1089,6 +1075,27 @@ async function loadConfigFromBundledFile(
}
}

async function mergeHookConfig(
patak-dev marked this conversation as resolved.
Show resolved Hide resolved
config: InlineConfig,
plugins: Plugin[],
configEnv: ConfigEnv
): Promise<InlineConfig> {
let conf = config

for (const p of getSortedPluginsByHook('config', plugins)) {
const hook = p.config
const handler = hook && 'handler' in hook ? hook.handler : hook
if (handler) {
const res = await handler(conf, configEnv)
if (res) {
conf = mergeConfig(conf, res)
}
}
}

return conf
}

export function getDepOptimizationConfig(
config: ResolvedConfig,
ssr: boolean
Expand Down