types: prefer property and pass isEntry rather than omit

#8701 (comment)
vitejs · Jun 23, 2022 · 6c4fe1f · 6c4fe1f
1 parent 1b3cd8e
commit 6c4fe1f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/packages/vite/src/node/plugin.ts b/packages/vite/src/node/plugin.ts
@@ -37,8 +37,7 @@ import type { ConfigEnv, ResolvedConfig } from './'
  * If a plugin should be applied only for server or build, a function format
  * config file can be used to conditional determine the plugins to use.
  */
-export interface Plugin
-  extends Omit<RollupPlugin, 'resolveId' | 'load' | 'transform'> {
+export interface Plugin extends RollupPlugin {
   /**
    * Enforce plugin invocation tier similar to webpack loaders.
    *
@@ -129,7 +128,7 @@ export interface Plugin
   /**
    * extend hooks with ssr flag
    */
-  resolveId?(
+  resolveId?: (
     this: PluginContext,
     source: string,
     importer: string | undefined,
@@ -140,17 +139,18 @@ export interface Plugin
        * @internal
        */
       scan?: boolean
+      isEntry: boolean
     }
-  ): Promise<ResolveIdResult> | ResolveIdResult
-  load?(
+  ) => Promise<ResolveIdResult> | ResolveIdResult
+  load?: (
     this: PluginContext,
     id: string,
     options?: { ssr?: boolean }
-  ): Promise<LoadResult> | LoadResult
-  transform?(
+  ) => Promise<LoadResult> | LoadResult
+  transform?: (
     this: TransformPluginContext,
     code: string,
     id: string,
     options?: { ssr?: boolean }
-  ): Promise<TransformResult> | TransformResult
+  ) => Promise<TransformResult> | TransformResult
 }
diff --git a/packages/vite/src/node/server/pluginContainer.ts b/packages/vite/src/node/server/pluginContainer.ts
@@ -97,6 +97,7 @@ export interface PluginContainer {
        * @internal
        */
       scan?: boolean
+      isEntry?: boolean
     }
   ): Promise<PartialResolvedId | null>
   transform(
@@ -527,6 +528,7 @@ export async function createPluginContainer(
       const skip = options?.skip
       const ssr = options?.ssr
       const scan = !!options?.scan
+      const isEntry = !!options?.isEntry
       const ctx = new Context()
       ctx.ssr = !!ssr
       ctx._scan = scan
@@ -546,7 +548,7 @@ export async function createPluginContainer(
           ctx as any,
           rawId,
           importer,
-          { ssr, scan }
+          { ssr, scan, isEntry }
         )
         if (!result) continue