Skip to content

Commit

Permalink
fix(scan): skip tsconfigRaw fallback if tsconfig is set (#13823)
Browse files Browse the repository at this point in the history
  • Loading branch information
bluwy authored Jul 13, 2023
1 parent e8880f0 commit b6155a1
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion packages/vite/src/node/optimizer/scan.ts
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ async function prepareEsbuildScanner(

const {
plugins = [],
tsconfig,
tsconfigRaw,
...esbuildOptions
} = config.optimizeDeps?.esbuildOptions ?? {}
Expand All @@ -222,8 +223,9 @@ async function prepareEsbuildScanner(
format: 'esm',
logLevel: 'silent',
plugins: [...plugins, plugin],
tsconfig,
tsconfigRaw:
typeof tsconfigRaw === 'string'
tsconfig || typeof tsconfigRaw === 'string'
? tsconfigRaw
: {
...tsconfigRaw,
Expand Down

0 comments on commit b6155a1

Please sign in to comment.