Skip to content

Commit 50a038c

Browse files
authored
Merge branch 'main' into chore/jest-migrate-bundler-and-ci
2 parents 87c4d96 + 5018e1e commit 50a038c

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

src/compiler/transpile/ts-config.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,12 @@ export const getTsOptionsToExtend = (config: d.ValidatedConfig): ts.CompilerOpti
2626
// if the `DIST_TYPES` output target is present then we'd like to emit
2727
// declaration files
2828
declaration: config.outputTargets.some(isOutputTargetDistTypes),
29-
module: ts.ModuleKind.ESNext,
30-
moduleResolution: ts.ModuleResolutionKind.NodeJs,
31-
noEmitOnError: false,
29+
module: config.tsCompilerOptions?.module || ts.ModuleKind.ESNext,
30+
moduleResolution:
31+
config.tsCompilerOptions?.moduleResolution === ts.ModuleResolutionKind.Bundler
32+
? ts.ModuleResolutionKind.Bundler
33+
: ts.ModuleResolutionKind.NodeJs,
34+
noEmitOnError: config.tsCompilerOptions?.noEmitOnError || false,
3235
outDir: config.cacheDir || config.sys.tmpDirSync(),
3336
sourceMap: config.sourceMap,
3437
inlineSources: config.sourceMap,

0 commit comments

Comments
 (0)