Skip to content

Commit 10936cd

Browse files
authored
chore: use tsconfig for client build (#8815)
1 parent 6886078 commit 10936cd

File tree

3 files changed

+4
-28
lines changed

3 files changed

+4
-28
lines changed

packages/vite/rollup.config.ts

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,7 @@ const envConfig = defineConfig({
1919
input: path.resolve(__dirname, 'src/client/env.ts'),
2020
plugins: [
2121
typescript({
22-
tsconfig: false,
23-
target: 'es2020',
24-
module: 'esnext',
25-
include: ['src/client/env.ts'],
26-
baseUrl: path.resolve(__dirname, 'src/env'),
27-
paths: {
28-
'types/*': ['../../types/*']
29-
}
22+
tsconfig: path.resolve(__dirname, 'src/client/tsconfig.json')
3023
})
3124
],
3225
output: {
@@ -40,13 +33,7 @@ const clientConfig = defineConfig({
4033
external: ['./env', '@vite/env'],
4134
plugins: [
4235
typescript({
43-
tsconfig: false,
44-
target: 'es2020',
45-
include: ['src/client/**/*.ts'],
46-
baseUrl: path.resolve(__dirname, 'src/client'),
47-
paths: {
48-
'types/*': ['../../types/*']
49-
}
36+
tsconfig: path.resolve(__dirname, 'src/client/tsconfig.json')
5037
})
5138
],
5239
output: {
@@ -102,12 +89,7 @@ function createNodePlugins(
10289
}),
10390
nodeResolve({ preferBuiltins: true }),
10491
typescript({
105-
tsconfig: 'src/node/tsconfig.json',
106-
module: 'esnext',
107-
target: 'es2020',
108-
include: ['src/**/*.ts', 'types/**'],
109-
exclude: ['src/**/__tests__/**'],
110-
esModuleInterop: true,
92+
tsconfig: path.resolve(__dirname, 'src/node/tsconfig.json'),
11193
sourceMap,
11294
declaration: declarationDir !== false,
11395
declarationDir: declarationDir !== false ? declarationDir : undefined

packages/vite/src/client/tsconfig.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
"extends": "../../tsconfig.base.json",
33
"include": ["./", "../../types"],
44
"compilerOptions": {
5-
"outDir": "../../dist/client",
6-
"module": "ESNext",
75
"types": [],
86
"lib": ["ESNext", "DOM"],
97
"declaration": false

packages/vite/src/node/tsconfig.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
"include": ["./", "../../types"],
44
"exclude": ["**/__tests__"],
55
"compilerOptions": {
6-
"target": "ES2020",
7-
"outDir": "../../dist/node",
8-
"module": "ESNext",
9-
"lib": ["ESNext", "DOM"],
10-
"sourceMap": true
6+
"lib": ["ESNext", "DOM"]
117
}
128
}

0 commit comments

Comments
 (0)