From 8365f0897d96abde9388d3c8e04fad0cb37b3f57 Mon Sep 17 00:00:00 2001 From: Giovanni Vinaccia Date: Fri, 20 Sep 2019 16:31:54 +0200 Subject: [PATCH 1/3] fixes https://github.com/TypeStrong/ts-loader/issues/1014 --- src/instances.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/instances.ts b/src/instances.ts index 5c475238d..cb6e6aad8 100644 --- a/src/instances.ts +++ b/src/instances.ts @@ -507,7 +507,11 @@ function getOutputFileNames( } if ( (configFile.options.declaration || configFile.options.composite) && - (instance.compiler as any).hasTSFileExtension(inputFileName) + (instance.compiler as any).hasTSFileExtension(inputFileName) && + !(instance.compiler as any).fileExtensionIs( + inputFileName, + typescript.Extension.Dts + ) ) { const dts = (instance.compiler as any).getOutputDeclarationFileName( inputFileName, From d921f4108e795ecf4cc9866d2db24e8240bf007a Mon Sep 17 00:00:00 2001 From: Giovanni Vinaccia Date: Fri, 20 Sep 2019 18:16:44 +0200 Subject: [PATCH 2/3] avoids processing definition files in getEmitOutput --- src/instances.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/instances.ts b/src/instances.ts index cb6e6aad8..e3cdca10e 100644 --- a/src/instances.ts +++ b/src/instances.ts @@ -507,11 +507,7 @@ function getOutputFileNames( } if ( (configFile.options.declaration || configFile.options.composite) && - (instance.compiler as any).hasTSFileExtension(inputFileName) && - !(instance.compiler as any).fileExtensionIs( - inputFileName, - typescript.Extension.Dts - ) + (instance.compiler as any).hasTSFileExtension(inputFileName) ) { const dts = (instance.compiler as any).getOutputDeclarationFileName( inputFileName, @@ -571,6 +567,9 @@ export function isReferencedFile(instance: TSInstance, filePath: string) { } export function getEmitOutput(instance: TSInstance, filePath: string) { + if (fileExtensionIs(filePath, typescript.Extension.Dts)) { + return []; + } const program = ensureProgram(instance); if (program !== undefined) { const sourceFile = program.getSourceFile(filePath); From 6d38ba54ea8b202828ccc281c5fbef50eee3cd8e Mon Sep 17 00:00:00 2001 From: Giovanni Vinaccia Date: Fri, 20 Sep 2019 18:26:20 +0200 Subject: [PATCH 3/3] uses instance.compiler instead get Extension enum --- src/instances.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/instances.ts b/src/instances.ts index e3cdca10e..d7456727b 100644 --- a/src/instances.ts +++ b/src/instances.ts @@ -567,7 +567,7 @@ export function isReferencedFile(instance: TSInstance, filePath: string) { } export function getEmitOutput(instance: TSInstance, filePath: string) { - if (fileExtensionIs(filePath, typescript.Extension.Dts)) { + if (fileExtensionIs(filePath, instance.compiler.Extension.Dts)) { return []; } const program = ensureProgram(instance);