Merge pull request #822 from JonWallsten/fix-declaration-output-wrong-folder

Fixed issue with incorrect output path for declaration files

Author: johnnyreilly

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 5.0.0
+
+* [feat: Fixed issue with incorrect output path for declaration files](https://github.com/TypeStrong/ts-loader/pull/822) - thanks @JonWallsten! **BREAKING CHANGE**
+
 ## 4.5.0
 
 * [feat: Added support for TypeScript declaration map](https://github.com/TypeStrong/ts-loader/pull/821) - thanks @JonWallsten!

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-loader",
-  "version": "4.5.0",
+  "version": "5.0.0",
   "description": "TypeScript loader for webpack",
   "main": "index.js",
   "types": "dist/types/index.d.ts",

src/after-compile.ts

@@ -251,7 +251,7 @@ function provideDeclarationFilesToWebpack(
 
     declarationFiles.forEach(declarationFile => {
       const assetPath = path.relative(
-        compilation.compiler.context,
+        compilation.compiler.outputPath,
         declarationFile.name
       );
       compilation.assets[assetPath] = {

src/interfaces.ts

@@ -149,6 +149,7 @@ export interface WebpackCompilation {
 export interface WebpackCompiler {
   isChild(): boolean;
   context: string; // a guess
+  outputPath: string;
   watchFileSystem: WebpackNodeWatchFileSystem;
   /** key is filepath and value is Date as a number */
   fileTimestamps: Map<string, number>;

test/comparison-tests/declarationOutput/tsconfig.json

@@ -1,5 +1,6 @@
 {
 	"compilerOptions": {
-		"declaration": true
+		"declaration": true,
+		"declarationDir": ".output"
 	}
 }

test/comparison-tests/declarationOutputWithMaps/expectedOutput-3.0/app.d.ts.map

@@ -1,8 +1,8 @@
            Asset       Size  Chunks             Chunk Names
        bundle.js   5.13 KiB    main  [emitted]  main
-    app.d.ts.map  194 bytes          [emitted]  
+    app.d.ts.map  197 bytes          [emitted]  
         app.d.ts  143 bytes          [emitted]  
-sub/dep.d.ts.map  142 bytes          [emitted]  
+sub/dep.d.ts.map  152 bytes          [emitted]  
     sub/dep.d.ts   96 bytes          [emitted]  
 Entrypoint main = bundle.js
 [./app.ts] 910 bytes {main} [built]

test/comparison-tests/declarationOutputWithMaps/expectedOutput-3.0/output.txt

@@ -1,6 +1,7 @@
 {
 	"compilerOptions": {
 		"declaration": true,
-		"declarationMap": true
+		"declarationMap": true,
+		"declarationDir": ".output"
 	}
 }