From 10936cd40692f630b49152a9b2429f0ef88017c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BF=A0=20/=20green?= <green@sapphi.red>
Date: Wed, 29 Jun 2022 00:31:58 +0900
Subject: [PATCH] chore: use tsconfig for client build (#8815)

---
 packages/vite/rollup.config.ts         | 24 +++---------------------
 packages/vite/src/client/tsconfig.json |  2 --
 packages/vite/src/node/tsconfig.json   |  6 +-----
 3 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/packages/vite/rollup.config.ts b/packages/vite/rollup.config.ts
index 8c3e2642d542b9..a630c2a813198c 100644
--- a/packages/vite/rollup.config.ts
+++ b/packages/vite/rollup.config.ts
@@ -19,14 +19,7 @@ const envConfig = defineConfig({
   input: path.resolve(__dirname, 'src/client/env.ts'),
   plugins: [
     typescript({
-      tsconfig: false,
-      target: 'es2020',
-      module: 'esnext',
-      include: ['src/client/env.ts'],
-      baseUrl: path.resolve(__dirname, 'src/env'),
-      paths: {
-        'types/*': ['../../types/*']
-      }
+      tsconfig: path.resolve(__dirname, 'src/client/tsconfig.json')
     })
   ],
   output: {
@@ -40,13 +33,7 @@ const clientConfig = defineConfig({
   external: ['./env', '@vite/env'],
   plugins: [
     typescript({
-      tsconfig: false,
-      target: 'es2020',
-      include: ['src/client/**/*.ts'],
-      baseUrl: path.resolve(__dirname, 'src/client'),
-      paths: {
-        'types/*': ['../../types/*']
-      }
+      tsconfig: path.resolve(__dirname, 'src/client/tsconfig.json')
     })
   ],
   output: {
@@ -102,12 +89,7 @@ function createNodePlugins(
     }),
     nodeResolve({ preferBuiltins: true }),
     typescript({
-      tsconfig: 'src/node/tsconfig.json',
-      module: 'esnext',
-      target: 'es2020',
-      include: ['src/**/*.ts', 'types/**'],
-      exclude: ['src/**/__tests__/**'],
-      esModuleInterop: true,
+      tsconfig: path.resolve(__dirname, 'src/node/tsconfig.json'),
       sourceMap,
       declaration: declarationDir !== false,
       declarationDir: declarationDir !== false ? declarationDir : undefined
diff --git a/packages/vite/src/client/tsconfig.json b/packages/vite/src/client/tsconfig.json
index c6421264c50409..b662c5cef0d6d7 100644
--- a/packages/vite/src/client/tsconfig.json
+++ b/packages/vite/src/client/tsconfig.json
@@ -2,8 +2,6 @@
   "extends": "../../tsconfig.base.json",
   "include": ["./", "../../types"],
   "compilerOptions": {
-    "outDir": "../../dist/client",
-    "module": "ESNext",
     "types": [],
     "lib": ["ESNext", "DOM"],
     "declaration": false
diff --git a/packages/vite/src/node/tsconfig.json b/packages/vite/src/node/tsconfig.json
index 7182bc6602ead7..270b34189571e1 100644
--- a/packages/vite/src/node/tsconfig.json
+++ b/packages/vite/src/node/tsconfig.json
@@ -3,10 +3,6 @@
   "include": ["./", "../../types"],
   "exclude": ["**/__tests__"],
   "compilerOptions": {
-    "target": "ES2020",
-    "outDir": "../../dist/node",
-    "module": "ESNext",
-    "lib": ["ESNext", "DOM"],
-    "sourceMap": true
+    "lib": ["ESNext", "DOM"]
   }
 }