From f2f4e6fd0a72ff38b739803af89c33b7c6aded8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnaud=20Barr=C3=A9?= <arnaud.barre@carbometrix.com>
Date: Sat, 10 Dec 2022 02:23:42 +0100
Subject: [PATCH] chore: also typecheck src/node/__test__

---
 package.json                                       |  2 +-
 packages/vite/scripts/tsconfig.json                |  6 ------
 packages/vite/src/node/__tests__/build.spec.ts     |  2 +-
 .../vite/src/node/__tests__/plugins/define.spec.ts |  4 +++-
 .../src/node/__tests__/plugins/esbuild.spec.ts     |  1 -
 packages/vite/src/node/__tests__/scan.spec.ts      | 14 +++++++++-----
 packages/vite/tsconfig.json                        | 10 ++++++++--
 7 files changed, 22 insertions(+), 17 deletions(-)
 delete mode 100644 packages/vite/scripts/tsconfig.json

diff --git a/package.json b/package.json
index 0c2e85ee7f4730..e9f1eccdad1295 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "postinstall": "simple-git-hooks",
     "format": "prettier --write --cache .",
     "lint": "eslint --cache .",
-    "typecheck": "tsc -p scripts --noEmit && tsc -p playground --noEmit && tsc -p packages/create-vite --noEmit && tsc -p packages/vite/scripts --noEmit",
+    "typecheck": "tsc -p scripts --noEmit && tsc -p playground --noEmit && tsc -p packages/create-vite --noEmit && tsc -p packages/vite --noEmit",
     "test": "run-s test-unit test-serve test-build",
     "test-serve": "vitest run -c vitest.config.e2e.ts",
     "test-build": "VITE_TEST_BUILD=1 vitest run -c vitest.config.e2e.ts",
diff --git a/packages/vite/scripts/tsconfig.json b/packages/vite/scripts/tsconfig.json
deleted file mode 100644
index af11a209690527..00000000000000
--- a/packages/vite/scripts/tsconfig.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "extends": "../tsconfig.base.json",
-  "compilerOptions": {
-    "module": "esnext"
-  }
-}
diff --git a/packages/vite/src/node/__tests__/build.spec.ts b/packages/vite/src/node/__tests__/build.spec.ts
index a77ef0d67b410b..4e65a2848602d3 100644
--- a/packages/vite/src/node/__tests__/build.spec.ts
+++ b/packages/vite/src/node/__tests__/build.spec.ts
@@ -421,7 +421,7 @@ describe('resolveBuildOutputs', () => {
   })
 
   test('array outputs: should ignore build.lib.formats', () => {
-    const log = { warn: vi.fn() } as Logger
+    const log = { warn: vi.fn() } as unknown as Logger
     expect(
       resolveBuildOutputs(
         [{ name: 'A' }],
diff --git a/packages/vite/src/node/__tests__/plugins/define.spec.ts b/packages/vite/src/node/__tests__/plugins/define.spec.ts
index b1634ef9adcd1a..b85ccaf70575c0 100644
--- a/packages/vite/src/node/__tests__/plugins/define.spec.ts
+++ b/packages/vite/src/node/__tests__/plugins/define.spec.ts
@@ -10,7 +10,9 @@ async function createDefinePluginTransform(
   const config = await resolveConfig({ define }, build ? 'build' : 'serve')
   const instance = definePlugin(config)
   return async (code: string) => {
-    const result = await instance.transform.call({}, code, 'foo.ts', { ssr })
+    const result = await (instance.transform as any).call({}, code, 'foo.ts', {
+      ssr,
+    })
     return result?.code || result
   }
 }
diff --git a/packages/vite/src/node/__tests__/plugins/esbuild.spec.ts b/packages/vite/src/node/__tests__/plugins/esbuild.spec.ts
index 2cc8c9304450a8..f1236a01f964fe 100644
--- a/packages/vite/src/node/__tests__/plugins/esbuild.spec.ts
+++ b/packages/vite/src/node/__tests__/plugins/esbuild.spec.ts
@@ -1,7 +1,6 @@
 import { describe, expect, test } from 'vitest'
 import type { ResolvedConfig, UserConfig } from '../../config'
 import {
-  ESBuildTransformResult,
   resolveEsbuildTranspileOptions,
   transformWithEsbuild,
 } from '../../plugins/esbuild'
diff --git a/packages/vite/src/node/__tests__/scan.spec.ts b/packages/vite/src/node/__tests__/scan.spec.ts
index 0a417f37a49b0a..b461f447e609d7 100644
--- a/packages/vite/src/node/__tests__/scan.spec.ts
+++ b/packages/vite/src/node/__tests__/scan.spec.ts
@@ -15,14 +15,14 @@ describe('optimizer-scan:script-test', () => {
     scriptRE.lastIndex = 0
     const [, tsOpenTag, tsContent] = scriptRE.exec(
       `<script lang="ts">${scriptContent}</script>`,
-    )
+    )!
     expect(tsOpenTag).toEqual('<script lang="ts">')
     expect(tsContent).toEqual(scriptContent)
 
     scriptRE.lastIndex = 0
     const [, openTag, content] = scriptRE.exec(
       `<script>${scriptContent}</script>`,
-    )
+    )!
     expect(openTag).toEqual('<script>')
     expect(content).toEqual(scriptContent)
   })
@@ -58,12 +58,16 @@ describe('optimizer-scan:script-test', () => {
 
   test('ordinary script tag test', () => {
     scriptRE.lastIndex = 0
-    const [, tag, content] = scriptRE.exec(`<script  >var test = null</script>`)
+    const [, tag, content] = scriptRE.exec(
+      `<script  >var test = null</script>`,
+    )!
     expect(tag).toEqual('<script  >')
     expect(content).toEqual('var test = null')
 
     scriptRE.lastIndex = 0
-    const [, tag1, content1] = scriptRE.exec(`<script>var test = null</script>`)
+    const [, tag1, content1] = scriptRE.exec(
+      `<script>var test = null</script>`,
+    )!
     expect(tag1).toEqual('<script>')
     expect(content1).toEqual('var test = null')
   })
@@ -90,7 +94,7 @@ describe('optimizer-scan:script-test', () => {
 
     shouldMatchArray.forEach((str) => {
       importsRE.lastIndex = 0
-      expect(importsRE.exec(str)[1]).toEqual("'vue'")
+      expect(importsRE.exec(str)![1]).toEqual("'vue'")
     })
 
     const shouldFailArray = [
diff --git a/packages/vite/tsconfig.json b/packages/vite/tsconfig.json
index 18848cfac9a999..a2dbcaf01f6cc3 100644
--- a/packages/vite/tsconfig.json
+++ b/packages/vite/tsconfig.json
@@ -1,8 +1,14 @@
 {
   "extends": "./tsconfig.base.json",
+  "include": [
+    "./rollup.config.ts",
+    "scripts",
+    "src/node/__tests__",
+    "src/types/shims.d.ts"
+  ],
   "compilerOptions": {
+    "esModuleInterop": true,
     "declaration": false,
     "resolveJsonModule": true
-  },
-  "include": ["./rollup.config.ts"]
+  }
 }