Skip to content

Commit 7e80779

Browse files
authored
Merge pull request #307 from ITGlobal/fix/dts-outdir
Fixed the bug "dts files are emitted in a wrong folder"
2 parents 922d9bb + 03c8da9 commit 7e80779

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ function ensureTypeScriptInstance(loaderOptions: LoaderOptions, loader: any): {
496496
let output = languageService.getEmitOutput(filePath);
497497
let declarationFile = output.outputFiles.filter(filePath => !!filePath.name.match(/\.d.ts$/)).pop();
498498
if (declarationFile) {
499-
let assetPath = path.relative(process.cwd(), declarationFile.name);
499+
let assetPath = path.relative(compilation.compiler.context, declarationFile.name);
500500
compilation.assets[assetPath] = {
501501
source: () => declarationFile.text,
502502
size: () => declarationFile.text.length

test/comparison-tests/declarationOutput/expectedOutput-2.0/.test/declarationOutput/app.d.ts renamed to test/comparison-tests/declarationOutput/expectedOutput-2.0/app.d.ts

File renamed without changes.
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
Asset Size Chunks Chunk Names
2-
bundle.js 2.19 kB 0 [emitted] main
3-
.test/declarationOutput/app.d.ts 110 bytes [emitted]
4-
.test/declarationOutput/sub/dep.d.ts 63 bytes [emitted]
1+
Asset Size Chunks Chunk Names
2+
bundle.js 2.19 kB 0 [emitted] main
3+
app.d.ts 110 bytes [emitted]
4+
sub/dep.d.ts 63 bytes [emitted]
55
chunk {0} bundle.js (main) 703 bytes [rendered]
66
[0] ./.test/declarationOutput/app.ts 535 bytes {0} [built]
77
[1] ./.test/declarationOutput/sub/dep.ts 168 bytes {0} [built]

test/comparison-tests/declarationOutput/expectedOutput-2.0/.test/declarationOutput/sub/dep.d.ts renamed to test/comparison-tests/declarationOutput/expectedOutput-2.0/sub/dep.d.ts

File renamed without changes.

0 commit comments

Comments
 (0)