Revert "feat: call configResolved hook on new plugins"

This reverts commit 0e552f5.
vitejs · Nov 5, 2024 · 51c3c07 · 51c3c07
1 parent 0e552f5
commit 51c3c07
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 59 deletions.
diff --git a/packages/vite/src/node/build.ts b/packages/vite/src/node/build.ts
@@ -49,11 +49,7 @@ import {
   normalizePath,
   partialEncodeURIPath,
 } from './utils'
-import {
-  getHookHandler,
-  perEnvironmentPlugin,
-  resolveEnvironmentPlugins,
-} from './plugin'
+import { perEnvironmentPlugin, resolveEnvironmentPlugins } from './plugin'
 import { manifestPlugin } from './plugins/manifest'
 import type { Logger } from './logger'
 import { dataURIPlugin } from './plugins/dataUri'
@@ -70,6 +66,7 @@ import {
 import { completeSystemWrapPlugin } from './plugins/completeSystemWrap'
 import { mergeConfig } from './publicUtils'
 import { webWorkerPostPlugin } from './plugins/worker'
+import { getHookHandler } from './plugins'
 import {
   BaseEnvironment,
   getDefaultResolvedEnvironmentOptions,

diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts
@@ -29,7 +29,6 @@ import type {
   PluginOption,
   PluginWithRequiredHook,
 } from './plugin'
-import { getHookHandler, getSortedPluginsByHook } from './plugin'
 import type {
   BuildEnvironmentOptions,
   BuilderOptions,
@@ -67,7 +66,12 @@ import {
   normalizeAlias,
   normalizePath,
 } from './utils'
-import { createPluginHookUtils, resolvePlugins } from './plugins'
+import {
+  createPluginHookUtils,
+  getHookHandler,
+  getSortedPluginsByHook,
+  resolvePlugins,
+} from './plugins'
 import type { ESBuildOptions } from './plugins/esbuild'
 import type {
   EnvironmentResolveOptions,

diff --git a/packages/vite/src/node/plugin.ts b/packages/vite/src/node/plugin.ts
@@ -333,24 +333,18 @@ export async function resolveEnvironmentPlugins(
   environment: PartialEnvironment,
 ): Promise<Plugin[]> {
   const environmentPlugins: Plugin[] = []
-  const topLevelConfig = environment.getTopLevelConfig()
-  for (const plugin of topLevelConfig.plugins) {
+  for (const plugin of environment.getTopLevelConfig().plugins) {
     if (plugin.applyToEnvironment) {
       const applied = await plugin.applyToEnvironment(environment)
       if (!applied) {
         continue
       }
       if (applied !== true) {
-        const newPlugins = (await asyncFlatten(arraify(applied))).filter(
-          Boolean,
-        ) as Plugin[]
-        for (const plugin of getSortedPluginsByHook(
-          'configResolved',
-          newPlugins,
-        )) {
-          getHookHandler(plugin.configResolved)(topLevelConfig)
-        }
-        environmentPlugins.push(...newPlugins)
+        environmentPlugins.push(
+          ...((await asyncFlatten(arraify(applied))).filter(
+            Boolean,
+          ) as Plugin[]),
+        )
         continue
       }
     }
@@ -373,39 +367,3 @@ export function perEnvironmentPlugin(
     applyToEnvironment,
   }
 }
-
-export function getSortedPluginsByHook<K extends keyof Plugin>(
-  hookName: K,
-  plugins: readonly Plugin[],
-): PluginWithRequiredHook<K>[] {
-  const sortedPlugins: Plugin[] = []
-  // Use indexes to track and insert the ordered plugins directly in the
-  // resulting array to avoid creating 3 extra temporary arrays per hook
-  let pre = 0,
-    normal = 0,
-    post = 0
-  for (const plugin of plugins) {
-    const hook = plugin[hookName]
-    if (hook) {
-      if (typeof hook === 'object') {
-        if (hook.order === 'pre') {
-          sortedPlugins.splice(pre++, 0, plugin)
-          continue
-        }
-        if (hook.order === 'post') {
-          sortedPlugins.splice(pre + normal + post++, 0, plugin)
-          continue
-        }
-      }
-      sortedPlugins.splice(pre + normal++, 0, plugin)
-    }
-  }
-
-  return sortedPlugins as PluginWithRequiredHook<K>[]
-}
-
-export function getHookHandler<T extends ObjectHook<Function>>(
-  hook: T,
-): HookHandler<T> {
-  return (typeof hook === 'object' ? hook.handler : hook) as HookHandler<T>
-}
diff --git a/packages/vite/src/node/plugins/index.ts b/packages/vite/src/node/plugins/index.ts
@@ -1,8 +1,8 @@
 import aliasPlugin, { type ResolverFunction } from '@rollup/plugin-alias'
+import type { ObjectHook } from 'rollup'
 import type { PluginHookUtils, ResolvedConfig } from '../config'
 import { isDepOptimizationDisabled } from '../optimizer'
 import type { HookHandler, Plugin, PluginWithRequiredHook } from '../plugin'
-import { getHookHandler, getSortedPluginsByHook } from '../plugin'
 import { watchPackageDataPlugin } from '../packages'
 import { jsonPlugin } from './json'
 import { resolvePlugin } from './resolve'
@@ -138,6 +138,42 @@ export function createPluginHookUtils(
   }
 }
 
+export function getSortedPluginsByHook<K extends keyof Plugin>(
+  hookName: K,
+  plugins: readonly Plugin[],
+): PluginWithRequiredHook<K>[] {
+  const sortedPlugins: Plugin[] = []
+  // Use indexes to track and insert the ordered plugins directly in the
+  // resulting array to avoid creating 3 extra temporary arrays per hook
+  let pre = 0,
+    normal = 0,
+    post = 0
+  for (const plugin of plugins) {
+    const hook = plugin[hookName]
+    if (hook) {
+      if (typeof hook === 'object') {
+        if (hook.order === 'pre') {
+          sortedPlugins.splice(pre++, 0, plugin)
+          continue
+        }
+        if (hook.order === 'post') {
+          sortedPlugins.splice(pre + normal + post++, 0, plugin)
+          continue
+        }
+      }
+      sortedPlugins.splice(pre + normal++, 0, plugin)
+    }
+  }
+
+  return sortedPlugins as PluginWithRequiredHook<K>[]
+}
+
+export function getHookHandler<T extends ObjectHook<Function>>(
+  hook: T,
+): HookHandler<T> {
+  return (typeof hook === 'object' ? hook.handler : hook) as HookHandler<T>
+}
+
 // Same as `@rollup/plugin-alias` default resolver, but we attach additional meta
 // if we can't resolve to something, which will error in `importAnalysis`
 export const viteAliasCustomResolver: ResolverFunction = async function (

diff --git a/packages/vite/src/node/server/hmr.ts b/packages/vite/src/node/server/hmr.ts
@@ -7,7 +7,7 @@ import type { RollupError } from 'rollup'
 import { CLIENT_DIR } from '../constants'
 import { createDebugger, normalizePath } from '../utils'
 import type { InferCustomEventPayload, ViteDevServer } from '..'
-import { getHookHandler } from '../plugin'
+import { getHookHandler } from '../plugins'
 import { isCSSRequest } from '../plugins/css'
 import { isExplicitImportRequired } from '../plugins/importAnalysis'
 import { getEnvFilesForMode } from '../env'

diff --git a/packages/vite/src/node/server/pluginContainer.ts b/packages/vite/src/node/server/pluginContainer.ts
@@ -77,8 +77,7 @@ import {
   timeFrom,
 } from '../utils'
 import { FS_PREFIX } from '../constants'
-import { createPluginHookUtils } from '../plugins'
-import { getHookHandler } from '../plugin'
+import { createPluginHookUtils, getHookHandler } from '../plugins'
 import { cleanUrl, unwrapId } from '../../shared/utils'
 import type { PluginHookUtils } from '../config'
 import type { Environment } from '../environment'