Skip to content

Commit c58e298

Browse files
Merge pull request microsoft#25368 from RyanCavanaugh/fix25355
.d.ts files don't have outputs
2 parents 837df49 + 2527da3 commit c58e298

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

src/compiler/tsbuild.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -291,17 +291,20 @@ namespace ts {
291291
function getOutputJavaScriptFileName(inputFileName: string, configFile: ParsedCommandLine) {
292292
const relativePath = getRelativePathFromDirectory(rootDirOfOptions(configFile.options, configFile.options.configFilePath!), inputFileName, /*ignoreCase*/ true);
293293
const outputPath = resolvePath(configFile.options.outDir || getDirectoryPath(configFile.options.configFilePath!), relativePath);
294-
return changeExtension(outputPath, (fileExtensionIs(inputFileName, Extension.Tsx) && configFile.options.jsx === JsxEmit.Preserve) ? Extension.Jsx : Extension.Js);
294+
const newExtension = fileExtensionIs(inputFileName, Extension.Json) ? Extension.Json :
295+
fileExtensionIs(inputFileName, Extension.Tsx) && configFile.options.jsx === JsxEmit.Preserve ? Extension.Jsx : Extension.Js;
296+
return changeExtension(outputPath, newExtension);
295297
}
296298

297299
function getOutputFileNames(inputFileName: string, configFile: ParsedCommandLine): ReadonlyArray<string> {
298-
if (configFile.options.outFile) {
300+
// outFile is handled elsewhere; .d.ts files don't generate outputs
301+
if (configFile.options.outFile || configFile.options.out || fileExtensionIs(inputFileName, Extension.Dts)) {
299302
return emptyArray;
300303
}
301304

302305
const outputs: string[] = [];
303306
outputs.push(getOutputJavaScriptFileName(inputFileName, configFile));
304-
if (configFile.options.declaration) {
307+
if (configFile.options.declaration && !fileExtensionIs(inputFileName, Extension.Json)) {
305308
const dts = getOutputDeclarationFileName(inputFileName, configFile);
306309
outputs.push(dts);
307310
if (configFile.options.declarationMap) {
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
declare const dts: any;

0 commit comments

Comments
 (0)