refactor: plugin container (#17288)

vitejs · May 29, 2024 · 909782f · 909782f
1 parent c373251
commit 909782f
Show file tree

Hide file tree

Showing 3 changed files with 691 additions and 628 deletions.
diff --git a/packages/vite/src/node/plugins/importAnalysis.ts b/packages/vite/src/node/plugins/importAnalysis.ts
@@ -63,6 +63,7 @@ import {
   withTrailingSlash,
   wrapId,
 } from '../../shared/utils'
+import type { TransformPluginContext } from '../server/pluginContainer'
 import { throwOutdatedRequest } from './optimizedDeps'
 import { isCSSRequest, isDirectCSSRequest } from './css'
 import { browserExternalId } from './resolve'
@@ -243,7 +244,10 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
         throwOutdatedRequest(importer)
       }
 
-      if (!imports.length && !(this as any)._addedImports) {
+      if (
+        !imports.length &&
+        !(this as unknown as TransformPluginContext)._addedImports
+      ) {
         importerModule.isSelfAccepting = false
         debug?.(
           `${timeFrom(msAtStart)} ${colors.dim(
@@ -730,9 +734,8 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
       // note that we want to handle .css?raw and .css?url here
       if (!isCSSRequest(importer) || SPECIAL_QUERY_RE.test(importer)) {
         // attached by pluginContainer.addWatchFile
-        const pluginImports = (this as any)._addedImports as
-          | Set<string>
-          | undefined
+        const pluginImports = (this as unknown as TransformPluginContext)
+          ._addedImports
         if (pluginImports) {
           ;(
             await Promise.all(