From 87e51f7abe8a033acef52d896abb3c7b0c530976 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Fri, 24 Jun 2022 16:03:21 +0900
Subject: [PATCH] fix: avoid type mismatch with Rollup (fix #7843) (#8701)

---
 packages/vite/src/node/plugin.ts                 | 13 +++++++------
 packages/vite/src/node/server/pluginContainer.ts |  4 +++-
 packages/vite/tsconfig.check.json                |  4 +++-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/packages/vite/src/node/plugin.ts b/packages/vite/src/node/plugin.ts
index 40845bf1f2dcfc..69b19415b0daa7 100644
--- a/packages/vite/src/node/plugin.ts
+++ b/packages/vite/src/node/plugin.ts
@@ -128,7 +128,7 @@ export interface Plugin extends RollupPlugin {
   /**
    * extend hooks with ssr flag
    */
-  resolveId?(
+  resolveId?: (
     this: PluginContext,
     source: string,
     importer: string | undefined,
@@ -139,17 +139,18 @@ export interface Plugin extends RollupPlugin {
        * @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
index 86dcefe024542f..0a708ed62c4e6c 100644
--- 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
 
diff --git a/packages/vite/tsconfig.check.json b/packages/vite/tsconfig.check.json
index cd8f8d6eeb3f2c..d1e9f059c9409c 100644
--- a/packages/vite/tsconfig.check.json
+++ b/packages/vite/tsconfig.check.json
@@ -14,7 +14,9 @@
       // indirect: postcss depends on it
       "source-map-js": ["./node_modules/source-map-js/source-map.d.ts"]
     },
-    "typeRoots": []
+    "typeRoots": [],
+    "strict": true,
+    "exactOptionalPropertyTypes": true
   },
   "include": ["dist/**/*.d.ts"]
 }