chore: use tsconfig for client build (vitejs#8815)

sodatea · Jun 28, 2022 · 10936cd · 10936cd
1 parent 6886078
commit 10936cd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 28 deletions.
diff --git 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
@@ -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
@@ -3,10 +3,6 @@
   "include": ["./", "../../types"],
   "exclude": ["**/__tests__"],
   "compilerOptions": {
-    "target": "ES2020",
-    "outDir": "../../dist/node",
-    "module": "ESNext",
-    "lib": ["ESNext", "DOM"],
-    "sourceMap": true
+    "lib": ["ESNext", "DOM"]
   }
 }