Skip to content

refactor: remove patchPlugins #18433

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

refactor: remove patchPlugins #18433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 3 additions & 9 deletions packages/vite/src/node/build.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,6 @@ export async function buildWithResolvedConfig(
export function resolveConfigToBuild(
inlineConfig: InlineConfig = {},
patchConfig?: (config: ResolvedConfig) => void,
patchPlugins?: (resolvedPlugins: Plugin[]) => void,
): Promise<ResolvedConfig> {
return resolveConfig(
inlineConfig,
Expand All @@ -550,7 +549,6 @@ export function resolveConfigToBuild(
'production',
false,
patchConfig,
patchPlugins,
)
}

Expand Down Expand Up @@ -1573,8 +1571,8 @@ export async function createBuilderWithResolvedConfig(
;(resolved.build as ResolvedBuildOptions) = {
...resolved.environments[environmentName].build,
}
}
const patchPlugins = (resolvedPlugins: Plugin[]) => {

const resolvedPlugins = resolved.plugins as Plugin[]
// Force opt-in shared plugins
let j = 0
for (let i = 0; i < resolvedPlugins.length; i++) {
Expand All @@ -1593,11 +1591,7 @@ export async function createBuilderWithResolvedConfig(
}
}
}
environmentConfig = await resolveConfigToBuild(
inlineConfig,
patchConfig,
patchPlugins,
)
environmentConfig = await resolveConfigToBuild(inlineConfig, patchConfig)
}

const environment = await environmentConfig.build.createEnvironment(
Expand Down
15 changes: 4 additions & 11 deletions packages/vite/src/node/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -812,8 +812,6 @@ export async function resolveConfig(
isPreview = false,
/** @internal */
patchConfig: ((config: ResolvedConfig) => void) | undefined = undefined,
/** @internal */
patchPlugins: ((resolvedPlugins: Plugin[]) => void) | undefined = undefined,
): Promise<ResolvedConfig> {
let config = inlineConfig
let configFileDependencies: string[] = []
Expand Down Expand Up @@ -1288,27 +1286,22 @@ export async function resolveConfig(
...resolved,
}

// Backward compatibility hook, modify the resolved config before it is used
// to create internal plugins. For example, `config.build.ssr`. Once we rework
// internal plugins to use environment.config, we can remove the dual
// patchConfig/patchPlugins and have a single patchConfig before configResolved
// gets called
patchConfig?.(resolved)

const resolvedPlugins = await resolvePlugins(
resolved,
prePlugins,
normalPlugins,
postPlugins,
)

// Backward compatibility hook used in builder, opt-in to shared plugins during build
patchPlugins?.(resolvedPlugins)
;(resolved.plugins as Plugin[]) = resolvedPlugins

// TODO: Deprecate config.getSortedPlugins and config.getSortedPluginHooks
Object.assign(resolved, createPluginHookUtils(resolved.plugins))

// Backward compatibility hook, modify the resolved config before it is used
// to create internal plugins. For example, `config.build.ssr`.
patchConfig?.(resolved)

// call configResolved hooks
await Promise.all(
resolved
Expand Down